projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Default installation with K8s instead of swarm
[osm/devops.git]
/
installers
/
full_install_osm.sh
diff --git
a/installers/full_install_osm.sh
b/installers/full_install_osm.sh
index
f8c02ca
..
a60898e
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)
@@
-1368,7
+1371,7
@@
EOF
[ -n "$KUBERNETES" ] && add_local_k8scluster
track add_local_k8scluster
[ -n "$KUBERNETES" ] && add_local_k8scluster
track add_local_k8scluster
- wget -q -O- https://osm-download.etsi.org/ftp/osm-
8.0-eight
/README2.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-
9.0-nine
/README2.txt &> /dev/null
track end
return 0
}
track end
return 0
}
@@
-1517,7
+1520,7
@@
SHOWOPTS=""
COMMIT_ID=""
ASSUME_YES=""
INSTALL_FROM_SOURCE=""
COMMIT_ID=""
ASSUME_YES=""
INSTALL_FROM_SOURCE=""
-RELEASE="Release
EIGHT
"
+RELEASE="Release
NINE
"
REPOSITORY="stable"
INSTALL_VIMEMU=""
INSTALL_PLA=""
REPOSITORY="stable"
INSTALL_VIMEMU=""
INSTALL_PLA=""
@@
-1534,8
+1537,8
@@
TO_REBUILD=""
INSTALL_NOLXD=""
INSTALL_NODOCKER=""
INSTALL_NOJUJU=""
INSTALL_NOLXD=""
INSTALL_NODOCKER=""
INSTALL_NOJUJU=""
-KUBERNETES=""
-NGUI=""
+KUBERNETES="
y
"
+NGUI="
y
"
INSTALL_K8S_MONITOR=""
INSTALL_NOHOSTCLIENT=""
SESSION_ID=`date +%s`
INSTALL_K8S_MONITOR=""
INSTALL_NOHOSTCLIENT=""
SESSION_ID=`date +%s`
@@
-1583,14
+1586,14
@@
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
REPO_ARGS+=(-r "$REPOSITORY")
;;
c)
REPO_ARGS+=(-r "$REPOSITORY")
;;
c)
- [ "${OPTARG}" == "swarm" ] && continue
+ [ "${OPTARG}" == "swarm" ] &&
KUBERNETES="" &&
continue
[ "${OPTARG}" == "k8s" ] && KUBERNETES="y" && continue
echo -e "Invalid argument for -i : ' $OPTARG'\n" >&2
usage && exit 1
;;
n)
[ "${OPTARG}" == "k8s" ] && KUBERNETES="y" && continue
echo -e "Invalid argument for -i : ' $OPTARG'\n" >&2
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
;;
@@
-1807,7
+1810,7
@@
fi
[ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0
#Installation starts here
[ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0
#Installation starts here
-wget -q -O- https://osm-download.etsi.org/ftp/osm-
8.0-eight
/README.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-
9.0-nine
/README.txt &> /dev/null
track start
[ -n "$INSTALL_LIGHTWEIGHT" ] && install_lightweight && echo -e "\nDONE" && exit 0
track start
[ -n "$INSTALL_LIGHTWEIGHT" ] && install_lightweight && echo -e "\nDONE" && exit 0
@@
-1828,7
+1831,7
@@
export OSM_USE_LOCAL_DEVOPS=true
#Install vim-emu (optional)
[ -n "$INSTALL_VIMEMU" ] && install_docker_ce && install_vimemu
#Install vim-emu (optional)
[ -n "$INSTALL_VIMEMU" ] && install_docker_ce && install_vimemu
-wget -q -O- https://osm-download.etsi.org/ftp/osm-
8.0-eight
/README2.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-
9.0-nine
/README2.txt &> /dev/null
track end
echo -e "\nDONE"
track end
echo -e "\nDONE"