X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=installers%2Ffull_install_osm.sh;h=d2b08db4973127ba9ecd73985091ca02cb39d6b8;hb=481ae7d606286c40e775fddd17146285a7d1a3cc;hp=f8c02ca064ee6e3f8228ccc8591fccd5e7b55a1a;hpb=a1376012fbf0a42f18d327a10cefa9a462c9fedd;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index f8c02ca0..d2b08db4 100755 --- 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 ! 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) @@ -1535,7 +1538,7 @@ INSTALL_NOLXD="" INSTALL_NODOCKER="" INSTALL_NOJUJU="" KUBERNETES="" -NGUI="" +NGUI="y" 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) - [ "${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 ;;