X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=96d8b8b72a60c10b46b2c69250476eecc3dd57a5;hb=HEAD;hp=e053bd7de25b2a0f81ed9ade7e9b937abb4cdeef;hpb=4db5d53daaac39a25d870bbb404b339407b9ebb2;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index e053bd7d..472c70b8 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -30,6 +30,7 @@ function usage(){ echo -e " -b tags/v1.1.0 (a specific tag)" echo -e " ..." echo -e " -a : use this apt proxy url when downloading apt packages (air-gapped installation)" + echo -e " -c : use a specific kubernetes engine (options: kubeadm, k3s, microk8s), default is kubeadm" echo -e " -s namespace when installed using k8s, default is osm" echo -e " -H use specific juju host controller IP" echo -e " -S use VCA/juju secret key" @@ -191,18 +192,10 @@ function install_osmclient(){ sudo DEBIAN_FRONTEND=noninteractive apt-get install -y libmagic1 python3 -m pip install -r /usr/lib/python3/dist-packages/osmclient/requirements.txt fi - [ -z "$INSTALL_LIGHTWEIGHT" ] && export OSM_HOSTNAME=`lxc list | awk '($2=="SO-ub"){print $6}'` - [ -z "$INSTALL_LIGHTWEIGHT" ] && export OSM_RO_HOSTNAME=`lxc list | awk '($2=="RO"){print $6}'` echo -e "\nOSM client installed" - if [ -z "$INSTALL_LIGHTWEIGHT" ]; then - echo -e "You might be interested in adding the following OSM client env variables to your .bashrc file:" - echo " export OSM_HOSTNAME=${OSM_HOSTNAME}" - echo " export OSM_RO_HOSTNAME=${OSM_RO_HOSTNAME}" - else - echo -e "OSM client assumes that OSM host is running in localhost (127.0.0.1)." - echo -e "In case you want to interact with a different OSM host, you will have to configure this env variable in your .bashrc file:" - echo " export OSM_HOSTNAME=" - fi + echo -e "OSM client assumes that OSM host is running in localhost (127.0.0.1)." + echo -e "In case you want to interact with a different OSM host, you will have to configure this env variable in your .bashrc file:" + echo " export OSM_HOSTNAME=nbi.${OSM_DEFAULT_IP}.nip.io" [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function return 0 } @@ -266,32 +259,56 @@ function deploy_osm_services() { # Generate helm values to be passed with -f osm-values.yaml sudo mkdir -p ${OSM_HELM_WORK_DIR} - sudo bash -c "cat << EOF > ${OSM_HELM_WORK_DIR}/osm-values.yaml + if [ -n "${INSTALL_JUJU}" ]; then + sudo bash -c "cat << EOF > ${OSM_HELM_WORK_DIR}/osm-values.yaml vca: pubkey: \"${OSM_VCA_PUBKEY}\" EOF" + fi # Generate helm values to be passed with --set OSM_HELM_OPTS="" # OSM_HELM_OPTS="${OSM_HELM_OPTS} --set nbi.useOsmSecret=false" + # OSM_HELM_OPTS="${OSM_HELM_OPTS} --set mysql.dbHostPath=${OSM_NAMESPACE_VOL}" # not needed as mysql is now bitnami helm chart + OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.repositoryBase=${DOCKER_REGISTRY_URL}${DOCKER_USER}" - OSM_HELM_OPTS="${OSM_HELM_OPTS} --set mysql.dbHostPath=${OSM_NAMESPACE_VOL}" - OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.host=${OSM_VCA_HOST}" - OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.secret=${OSM_VCA_SECRET}" - OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.cacert=${OSM_VCA_CACERT}" + [ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set-string global.image.tag=${OSM_DOCKER_TAG}" + [ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set prometheus.server.sidecarContainers.prometheus-config-sidecar.image=${DOCKER_REGISTRY_URL}${DOCKER_USER}/prometheus:${OSM_DOCKER_TAG}" + + OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.hostname=${OSM_DEFAULT_IP}.nip.io" + OSM_HELM_OPTS="${OSM_HELM_OPTS} --set grafana.ingress.hosts={grafana.${OSM_DEFAULT_IP}.nip.io}" + OSM_HELM_OPTS="${OSM_HELM_OPTS} --set prometheus.server.ingress.hosts={prometheus.${OSM_DEFAULT_IP}.nip.io}" + # OSM_HELM_OPTS="${OSM_HELM_OPTS} --set prometheus.alertmanager.ingress.hosts={alertmanager.${OSM_DEFAULT_IP}.nip.io}" + + if [ -n "${INSTALL_JUJU}" ]; then + OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.enabled=true" + OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.host=${OSM_VCA_HOST}" + OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.secret=${OSM_VCA_SECRET}" + OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.cacert=${OSM_VCA_CACERT}" + fi [ -n "$OSM_VCA_APIPROXY" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set lcm.config.OSMLCM_VCA_APIPROXY=${OSM_VCA_APIPROXY}" - [ ! "$OSM_DOCKER_TAG" == "testing-daily" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.tag=${OSM_DOCKER_TAG}" + [ -n "${INSTALL_NGSA}" ] || OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.oldServiceAssurance=true" if [ -n "${OSM_BEHIND_PROXY}" ]; then OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.behindHttpProxy=true" - [ -n "${HTTP_PROXY}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.httpProxy.HTTP_PROXY=${HTTP_PROXY}" - [ -n "${HTTPS_PROXY}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.httpProxy.HTTPS_PROXY=${HTTPS_PROXY}" - [ -n "${NO_PROXY}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.httpProxy.NO_PROXY=${NO_PROXY}" + [ -n "${HTTP_PROXY}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.httpProxy.HTTP_PROXY=\"${HTTP_PROXY}\"" + [ -n "${HTTPS_PROXY}" ] && OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.httpProxy.HTTPS_PROXY=\"${HTTPS_PROXY}\"" + if [ -n "${NO_PROXY}" ]; then + if [[ ! "${NO_PROXY}" =~ .*".svc".* ]]; then + NO_PROXY="${NO_PROXY},.svc" + fi + if [[ ! "${NO_PROXY}" =~ .*".cluster.local".* ]]; then + NO_PROXY="${NO_PROXY},.cluster.local" + fi + OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.httpProxy.NO_PROXY=\"${NO_PROXY//,/\,}\"" + fi fi - echo "helm -n $OSM_NAMESPACE install $OSM_NAMESPACE $OSM_DEVOPS/installers/helm/osm -f ${OSM_HELM_WORK_DIR}/osm-values.yaml ${OSM_HELM_OPTS}" - helm -n $OSM_NAMESPACE install $OSM_NAMESPACE $OSM_DEVOPS/installers/helm/osm -f ${OSM_HELM_WORK_DIR}/osm-values.yaml ${OSM_HELM_OPTS} - + if [ -n "${INSTALL_JUJU}" ]; then + OSM_HELM_OPTS="-f ${OSM_HELM_WORK_DIR}/osm-values.yaml ${OSM_HELM_OPTS}" + fi + echo "helm upgrade --install -n $OSM_NAMESPACE --create-namespace $OSM_NAMESPACE $OSM_DEVOPS/installers/helm/osm ${OSM_HELM_OPTS}" + helm upgrade --install -n $OSM_NAMESPACE --create-namespace $OSM_NAMESPACE $OSM_DEVOPS/installers/helm/osm ${OSM_HELM_OPTS} # Override existing values.yaml with the final values.yaml used to install OSM helm -n $OSM_NAMESPACE get values $OSM_NAMESPACE | sudo tee -a ${OSM_HELM_WORK_DIR}/osm-values.yaml [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function @@ -301,7 +318,7 @@ EOF" function deploy_charmed_services() { [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function juju add-model $OSM_NAMESPACE $OSM_VCA_K8S_CLOUDNAME - juju deploy ch:mongodb-k8s -m $OSM_NAMESPACE + juju deploy ch:mongodb-k8s -m $OSM_NAMESPACE --channel latest/stable [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function } @@ -317,7 +334,7 @@ function deploy_mongodb() { function install_osm_ngsa_service() { [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function - NGSA_OPTS="-d ${OSM_HELM_WORK_DIR} -D ${OSM_DEVOPS} -t ${OSM_DOCKER_TAG} -U ${DOCKER_USER} ${DEBUG_INSTALL}" + NGSA_OPTS="-i ${OSM_DEFAULT_IP} -d ${OSM_HELM_WORK_DIR} -D ${OSM_DEVOPS} -t ${OSM_DOCKER_TAG} -U ${DOCKER_USER} ${DEBUG_INSTALL}" [ -n "${DOCKER_REGISTRY_URL}" ] && NGSA_OPTS="${NGSA_OPTS} -r ${DOCKER_REGISTRY_URL}" $OSM_DEVOPS/installers/install_ngsa.sh ${NGSA_OPTS} || \ FATAL_TRACK install_osm_ngsa_service "install_ngsa.sh failed" @@ -326,18 +343,20 @@ function install_osm_ngsa_service() { function add_local_k8scluster() { [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function - /usr/bin/osm --all-projects vim-create \ + # OSM_HOSTNAME=$(kubectl get --namespace osm -o jsonpath="{.spec.rules[0].host}" ingress nbi-ingress) + OSM_HOSTNAME="nbi.${OSM_DEFAULT_IP}.nip.io:443" + /usr/bin/osm --hostname ${OSM_HOSTNAME} --all-projects vim-create \ --name _system-osm-vim \ --account_type dummy \ --auth_url http://dummy \ --user osm --password osm --tenant osm \ --description "dummy" \ --config '{management_network_name: mgmt}' - /usr/bin/osm --all-projects k8scluster-add \ + /usr/bin/osm --hostname ${OSM_HOSTNAME} --all-projects k8scluster-add \ --creds ${HOME}/.kube/config \ --vim _system-osm-vim \ --k8s-nets '{"net1": null}' \ - --version '1.15' \ + --version '1.29' \ --description "OSM Internal Cluster" \ _system-osm-k8s [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function @@ -440,7 +459,9 @@ function install_osm() { check_osm_behind_proxy check_packages "git wget curl tar snapd" - sudo snap install jq || FATAL "Could not install jq (snap package). Make sure that snap works" + if [ -n "${INSTALL_JUJU}" ]; then + sudo snap install jq || FATAL "Could not install jq (snap package). Make sure that snap works" + fi find_devops_folder track start release $RELEASE none none docker_tag $OSM_DOCKER_TAG none none installation_type $OSM_INSTALLATION_TYPE none none os_info $os_info none none @@ -465,8 +486,8 @@ function install_osm() { # configure apt proxy [ -n "$APT_PROXY_URL" ] && configure_apt_proxy $APT_PROXY_URL - # if no host is passed in, we need to install lxd, unless explicilty asked not to - if [ -z "$OSM_VCA_HOST" ] && [ -z "$INSTALL_NOLXD" ] && [ -z "$LXD_CLOUD_FILE" ]; then + # if lxd is requested, we will install it + if [ -n "$INSTALL_LXD" ]; then LXD_INSTALL_OPTS="-D ${OSM_DEVOPS} -i ${OSM_DEFAULT_IF} ${DEBUG_INSTALL}" [ -n "${OSM_BEHIND_PROXY}" ] && LXD_INSTALL_OPTS="${LXD_INSTALL_OPTS} -P" $OSM_DEVOPS/installers/install_lxd.sh ${LXD_INSTALL_OPTS} || FATAL_TRACK lxd "install_lxd.sh failed" @@ -474,31 +495,41 @@ function install_osm() { track prereq prereqok_ok - if [ ! -n "$INSTALL_NODOCKER" ]; then + if [ -n "$INSTALL_DOCKER" ] || [ "${K8S_CLUSTER_ENGINE}" == "kubeadm" ]; then + if [ "${K8S_CLUSTER_ENGINE}" == "kubeadm" ]; then + echo "Kubeadm requires docker, so docker will be installed." + fi DOCKER_CE_OPTS="-D ${OSM_DEVOPS} ${DEBUG_INSTALL}" [ -n "${DOCKER_PROXY_URL}" ] && DOCKER_CE_OPTS="${DOCKER_CE_OPTS} -p ${DOCKER_PROXY_URL}" [ -n "${OSM_BEHIND_PROXY}" ] && DOCKER_CE_OPTS="${DOCKER_CE_OPTS} -P" $OSM_DEVOPS/installers/install_docker_ce.sh ${DOCKER_CE_OPTS} || FATAL_TRACK docker_ce "install_docker_ce.sh failed" fi - track docker_ce docker_ce_ok - echo "Creating folders for installation" - [ ! -d "$OSM_WORK_DIR" ] && sudo mkdir -p $OSM_WORK_DIR - sudo cp -b $OSM_DEVOPS/installers/kubeadm-config.yaml $OSM_WORK_DIR/kubeadm-config.yaml - - $OSM_DEVOPS/installers/install_kubeadm_cluster.sh -i ${OSM_DEFAULT_IP} -d ${OSM_WORK_DIR} -D ${OSM_DEVOPS} ${DEBUG_INSTALL} || \ - FATAL_TRACK k8scluster "install_kubeadm_cluster.sh failed" + $OSM_DEVOPS/installers/install_helm_client.sh -D ${OSM_DEVOPS} ${DEBUG_INSTALL} || \ + FATAL_TRACK k8scluster "install_helm_client.sh failed" + track helm_client install_helm_client_ok + + if [ "${K8S_CLUSTER_ENGINE}" == "kubeadm" ]; then + KUBEADM_INSTALL_OPTS="-d ${OSM_WORK_DIR} -D ${OSM_DEVOPS} ${DEBUG_INSTALL}" + $OSM_DEVOPS/installers/install_kubeadm_cluster.sh ${KUBEADM_INSTALL_OPTS} || \ + FATAL_TRACK k8scluster "install_kubeadm_cluster.sh failed" + K8SCLUSTER_ADDONS_INSTALL_OPTS="-i ${OSM_DEFAULT_IP} -d ${OSM_WORK_DIR} -D ${OSM_DEVOPS} ${DEBUG_INSTALL}" + $OSM_DEVOPS/installers/install_cluster_addons.sh ${K8SCLUSTER_ADDONS_INSTALL_OPTS} || \ + FATAL_TRACK k8scluster "install_cluster_addons.sh failed" + fi track k8scluster k8scluster_ok - JUJU_OPTS="-D ${OSM_DEVOPS} -s ${OSM_NAMESPACE} -i ${OSM_DEFAULT_IP} ${DEBUG_INSTALL} ${INSTALL_NOJUJU} ${INSTALL_CACHELXDIMAGES}" - [ -n "${OSM_VCA_HOST}" ] && JUJU_OPTS="$JUJU_OPTS -H ${OSM_VCA_HOST}" - [ -n "${LXD_CLOUD_FILE}" ] && JUJU_OPTS="$JUJU_OPTS -l ${LXD_CLOUD_FILE}" - [ -n "${LXD_CRED_FILE}" ] && JUJU_OPTS="$JUJU_OPTS -L ${LXD_CRED_FILE}" - [ -n "${CONTROLLER_NAME}" ] && JUJU_OPTS="$JUJU_OPTS -K ${CONTROLLER_NAME}" - [ -n "${OSM_BEHIND_PROXY}" ] && JUJU_OPTS="${JUJU_OPTS} -P" - $OSM_DEVOPS/installers/install_juju.sh ${JUJU_OPTS} || FATAL_TRACK juju "install_juju.sh failed" - set_vca_variables + if [ -n "${INSTALL_JUJU}" ]; then + JUJU_OPTS="-D ${OSM_DEVOPS} -s ${OSM_NAMESPACE} -i ${OSM_DEFAULT_IP} ${DEBUG_INSTALL} ${INSTALL_CACHELXDIMAGES}" + [ -n "${OSM_VCA_HOST}" ] && JUJU_OPTS="$JUJU_OPTS -H ${OSM_VCA_HOST}" + [ -n "${LXD_CLOUD_FILE}" ] && JUJU_OPTS="$JUJU_OPTS -l ${LXD_CLOUD_FILE}" + [ -n "${LXD_CRED_FILE}" ] && JUJU_OPTS="$JUJU_OPTS -L ${LXD_CRED_FILE}" + [ -n "${CONTROLLER_NAME}" ] && JUJU_OPTS="$JUJU_OPTS -K ${CONTROLLER_NAME}" + [ -n "${OSM_BEHIND_PROXY}" ] && JUJU_OPTS="${JUJU_OPTS} -P" + $OSM_DEVOPS/installers/install_juju.sh ${JUJU_OPTS} || FATAL_TRACK juju "install_juju.sh failed" + set_vca_variables + fi track juju juju_ok # Deploy OSM services @@ -533,9 +564,12 @@ function install_osm() { add_local_k8scluster track final_ops add_local_k8scluster_ok - arrange_docker_default_network_policy + # if lxd is requested, iptables firewall is updated to work with both docker and LXD + if [ -n "$INSTALL_LXD" ]; then + arrange_docker_default_network_policy + fi - wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README2.txt &> /dev/null + wget -q -O- https://osm-download.etsi.org/ftp/osm-15.0-fifteen/README2.txt &> /dev/null track end sudo find /etc/osm [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function @@ -614,6 +648,7 @@ function install_k8s_monitoring() { function dump_vars(){ [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function echo "APT_PROXY_URL=$APT_PROXY_URL" + echo "K8S_CLUSTER_ENGINE=$K8S_CLUSTER_ENGINE" echo "DEVELOP=$DEVELOP" echo "DEBUG_INSTALL=$DEBUG_INSTALL" echo "DOCKER_NOBUILD=$DOCKER_NOBUILD" @@ -622,13 +657,11 @@ function dump_vars(){ echo "DOCKER_USER=$DOCKER_USER" echo "INSTALL_CACHELXDIMAGES=$INSTALL_CACHELXDIMAGES" echo "INSTALL_FROM_SOURCE=$INSTALL_FROM_SOURCE" + echo "INSTALL_JUJU=$INSTALL_JUJU" echo "INSTALL_K8S_MONITOR=$INSTALL_K8S_MONITOR" - echo "INSTALL_LIGHTWEIGHT=$INSTALL_LIGHTWEIGHT" echo "INSTALL_LXD=$INSTALL_LXD" echo "INSTALL_NGSA=$INSTALL_NGSA" - echo "INSTALL_NODOCKER=$INSTALL_NODOCKER" - echo "INSTALL_NOJUJU=$INSTALL_NOJUJU" - echo "INSTALL_NOLXD=$INSTALL_NOLXD" + echo "INSTALL_DOCKER=$INSTALL_DOCKER" echo "INSTALL_ONLY=$INSTALL_ONLY" echo "INSTALL_PLA=$INSTALL_PLA" echo "INSTALL_TO_OPENSTACK=$INSTALL_TO_OPENSTACK" @@ -688,17 +721,17 @@ SHOWOPTS="" COMMIT_ID="" ASSUME_YES="" APT_PROXY_URL="" +K8S_CLUSTER_ENGINE="kubeadm" INSTALL_FROM_SOURCE="" DEBUG_INSTALL="" -RELEASE="ReleaseTEN" -REPOSITORY="stable" +RELEASE="testing-daily" +REPOSITORY="testing" INSTALL_K8S_MONITOR="" INSTALL_NGSA="y" INSTALL_PLA="" INSTALL_VIMEMU="" LXD_REPOSITORY_BASE="https://osm-download.etsi.org/repository/osm/lxd" LXD_REPOSITORY_PATH="" -INSTALL_LIGHTWEIGHT="y" INSTALL_TO_OPENSTACK="" OPENSTACK_OPENRC_FILE_OR_CLOUD="" OPENSTACK_PUBLIC_NET_NAME="" @@ -709,9 +742,8 @@ OPENSTACK_VM_NAME="server-osm" OPENSTACK_PYTHON_VENV="$HOME/.virtual-envs/osm" INSTALL_ONLY="" TO_REBUILD="" -INSTALL_NOLXD="" -INSTALL_NODOCKER="" -INSTALL_NOJUJU="" +INSTALL_DOCKER="" +INSTALL_JUJU="" INSTALL_NOHOSTCLIENT="" INSTALL_CACHELXDIMAGES="" OSM_DEVOPS= @@ -750,7 +782,7 @@ DOCKER_PROXY_URL= MODULE_DOCKER_TAG= OSM_INSTALLATION_TYPE="Default" -while getopts ":a:b:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o; do +while getopts ":a:b:c:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o; do case "${o}" in a) APT_PROXY_URL=${OPTARG} @@ -759,6 +791,14 @@ while getopts ":a:b:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o; COMMIT_ID=${OPTARG} PULL_IMAGES="" ;; + c) + K8S_CLUSTER_ENGINE=${OPTARG} + [ "${K8S_CLUSTER_ENGINE}" == "kubeadm" ] && continue + [ "${K8S_CLUSTER_ENGINE}" == "k3s" ] && continue + [ "${K8S_CLUSTER_ENGINE}" == "microk8s" ] && continue + echo -e "Invalid argument for -c : ' ${K8S_CLUSTER_ENGINE}'\n" >&2 + usage && exit 1 + ;; r) REPOSITORY="${OPTARG}" REPO_ARGS+=(-r "$REPOSITORY") @@ -868,11 +908,14 @@ while getopts ":a:b:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o; [ "${OPTARG}" == "reconfigure" ] && RECONFIGURE="y" && continue [ "${OPTARG}" == "test" ] && TEST_INSTALLER="y" && continue [ "${OPTARG}" == "lxdinstall" ] && INSTALL_LXD="y" && continue - [ "${OPTARG}" == "nolxd" ] && INSTALL_NOLXD="y" && continue - [ "${OPTARG}" == "nodocker" ] && INSTALL_NODOCKER="y" && continue + [ "${OPTARG}" == "lxd" ] && INSTALL_LXD="y" && continue + [ "${OPTARG}" == "nolxd" ] && INSTALL_LXD="" && continue + [ "${OPTARG}" == "docker" ] && INSTALL_DOCKER="y" && continue + [ "${OPTARG}" == "nodocker" ] && INSTALL_DOCKER="" && continue [ "${OPTARG}" == "showopts" ] && SHOWOPTS="y" && continue [ "${OPTARG}" == "nohostports" ] && NO_HOST_PORTS="y" && continue - [ "${OPTARG}" == "nojuju" ] && INSTALL_NOJUJU="--nojuju" && continue + [ "${OPTARG}" == "juju" ] && INSTALL_JUJU="y" && continue + [ "${OPTARG}" == "nojuju" ] && INSTALL_JUJU="" && continue [ "${OPTARG}" == "nodockerbuild" ] && DOCKER_NOBUILD="y" && continue [ "${OPTARG}" == "nohostclient" ] && INSTALL_NOHOSTCLIENT="y" && continue [ "${OPTARG}" == "pullimages" ] && continue @@ -880,7 +923,6 @@ while getopts ":a:b:r:n:k:u:R:D:o:O:m:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:-: hy" o; [ "${OPTARG}" == "charmed" ] && CHARMED="y" && OSM_INSTALLATION_TYPE="Charmed" && continue [ "${OPTARG}" == "bundle" ] && continue [ "${OPTARG}" == "k8s" ] && continue - [ "${OPTARG}" == "lxd" ] && continue [ "${OPTARG}" == "lxd-cred" ] && continue [ "${OPTARG}" == "microstack" ] && continue [ "${OPTARG}" == "overlay" ] && continue @@ -940,7 +982,7 @@ fi # Installation starts here # Get README and create OSM_TRACK_INSTALLATION_ID -wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README.txt &> /dev/null +wget -q -O- https://osm-download.etsi.org/ftp/osm-15.0-fifteen/README.txt &> /dev/null export OSM_TRACK_INSTALLATION_ID="$(date +%s)-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16)" # Get OS info to be tracked @@ -951,34 +993,32 @@ echo $os_release os_info="${os_distro}_${os_release}" os_info="${os_info// /_}" -# Charmed installation if [ -n "$CHARMED" ]; then + # Charmed installation sudo snap install jq || FATAL "Could not install jq (snap package). Make sure that snap works" ${OSM_DEVOPS}/installers/charmed_install.sh --tag $OSM_DOCKER_TAG "$@" || \ FATAL_TRACK charmed_install "charmed_install.sh failed" - wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README2.txt &> /dev/null + wget -q -O- https://osm-download.etsi.org/ftp/osm-15.0-fifteen/README2.txt &> /dev/null echo -e "\nDONE" exit 0 -fi - -# Installation to Openstack -if [ -n "$INSTALL_TO_OPENSTACK" ]; then +elif [ -n "$INSTALL_TO_OPENSTACK" ]; then + # Installation to Openstack install_to_openstack $OPENSTACK_OPENRC_FILE_OR_CLOUD $OPENSTACK_PUBLIC_NET_NAME $OPENSTACK_ATTACH_VOLUME echo -e "\nDONE" exit 0 +else + # Community_installer + # Check incompatible options + [ -n "$TO_REBUILD" ] && [ "$TO_REBUILD" != " NONE" ] && echo $TO_REBUILD | grep -q NONE && FATAL "Incompatible option: -m NONE cannot be used with other -m options" + [ -n "$TO_REBUILD" ] && [ "$TO_REBUILD" == " PLA" ] && [ -z "$INSTALL_PLA" ] && FATAL "Incompatible option: -m PLA cannot be used without --pla option" + # Special cases go first + # if develop, we force master + [ -z "$COMMIT_ID" ] && [ -n "$DEVELOP" ] && COMMIT_ID="master" + [ -n "$INSTALL_ONLY" ] && [ -n "$INSTALL_K8S_MONITOR" ] && install_k8s_monitoring + [ -n "$INSTALL_ONLY" ] && [ -n "$INSTALL_NGSA" ] && install_osm_ngsa_service + [ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0 + # This is where installation starts + install_osm + echo -e "\nDONE" + exit 0 fi - -# Community_installer -# Check incompatible options -[ -n "$TO_REBUILD" ] && [ "$TO_REBUILD" != " NONE" ] && echo $TO_REBUILD | grep -q NONE && FATAL "Incompatible option: -m NONE cannot be used with other -m options" -[ -n "$TO_REBUILD" ] && [ "$TO_REBUILD" == " PLA" ] && [ -z "$INSTALL_PLA" ] && FATAL "Incompatible option: -m PLA cannot be used without --pla option" -# Special cases go first -# if develop, we force master -[ -z "$COMMIT_ID" ] && [ -n "$DEVELOP" ] && COMMIT_ID="master" -[ -n "$INSTALL_ONLY" ] && [ -n "$INSTALL_K8S_MONITOR" ] && install_k8s_monitoring -[ -n "$INSTALL_ONLY" ] && [ -n "$INSTALL_NGSA" ] && install_osm_ngsa_service -[ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0 -# This is where installation starts -install_osm -echo -e "\nDONE" -exit 0