projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Additional arguments
[osm/devops.git]
/
installers
/
full_install_osm.sh
diff --git
a/installers/full_install_osm.sh
b/installers/full_install_osm.sh
index
f8c02ca
..
d2b08db
100755
(executable)
--- a/
installers/full_install_osm.sh
+++ b/
installers/full_install_osm.sh
@@
-751,6
+751,9
@@
function generate_docker_env_files() {
if [ ! -f $OSM_DOCKER_WORK_DIR/ro.env ]; then
echo "RO_DB_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" |$WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/ro.env
fi
if [ ! -f $OSM_DOCKER_WORK_DIR/ro.env ]; then
echo "RO_DB_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}" |$WORKDIR_SUDO tee $OSM_DOCKER_WORK_DIR/ro.env
fi
+ if ! grep -Fq "OSMRO_DATABASE_COMMONKEY" $OSM_DOCKER_WORK_DIR/ro.env; then
+ echo "OSMRO_DATABASE_COMMONKEY=${OSM_DATABASE_COMMONKEY}" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/ro.env
+ fi
# Keystone
KEYSTONE_DB_PASSWORD=$(generate_secret)
# Keystone
KEYSTONE_DB_PASSWORD=$(generate_secret)
@@
-1535,7
+1538,7
@@
INSTALL_NOLXD=""
INSTALL_NODOCKER=""
INSTALL_NOJUJU=""
KUBERNETES=""
INSTALL_NODOCKER=""
INSTALL_NOJUJU=""
KUBERNETES=""
-NGUI=""
+NGUI="
y
"
INSTALL_K8S_MONITOR=""
INSTALL_NOHOSTCLIENT=""
SESSION_ID=`date +%s`
INSTALL_K8S_MONITOR=""
INSTALL_NOHOSTCLIENT=""
SESSION_ID=`date +%s`
@@
-1589,8
+1592,8
@@
while getopts ":b:r:c:n:k:u:R:D:o:O:m:N:H:S:s:w:t:U:P:A:l:L:K:-: hy" o; do
usage && exit 1
;;
n)
usage && exit 1
;;
n)
- [ "${OPTARG}" == "lwui" ] && continue
- [ "${OPTARG}" == "ngui" ] &&
NGUI="y" &&
continue
+ [ "${OPTARG}" == "lwui" ] &&
NGUI="" &&
continue
+ [ "${OPTARG}" == "ngui" ] && continue
echo -e "Invalid argument for -n : ' $OPTARG'\n" >&2
usage && exit 1
;;
echo -e "Invalid argument for -n : ' $OPTARG'\n" >&2
usage && exit 1
;;