From c0006e7fa560c3e375e0080b77a090ee49141156 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 29 Apr 2025 14:56:33 +0200 Subject: [PATCH] Feature 11071: Modular OSM installation. Remove partial installation of components Change-Id: Iae20aa7c4704ee8f26e447da7cd9e56d50b900a4 Signed-off-by: garciadeblas --- installers/full_install_osm.sh | 25 ------------------------- installers/install_osm.sh | 1 - 2 files changed, 26 deletions(-) diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index b465ff45..f0723eac 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -37,7 +37,6 @@ function usage(){ echo -e " -S use VCA/juju secret key" echo -e " -P use VCA/juju public key file" echo -e " -A use VCA/juju API proxy" - echo -e " -o : ONLY installs the specified component (k8s_monitor, ng-sa, k8scluster, docker, deploy-osm)" echo -e " -w : Location to store runtime installation" echo -e " -l: LXD cloud yaml file" echo -e " -L: LXD credentials yaml file" @@ -597,10 +596,6 @@ function dump_vars(){ echo "INSTALL_K8S_MONITOR=$INSTALL_K8S_MONITOR" echo "INSTALL_LXD=$INSTALL_LXD" echo "INSTALL_DOCKER=$INSTALL_DOCKER" - echo "INSTALL_ONLY=$INSTALL_ONLY" - echo "INSTALL_ONLY_DEPLOY_OSM=$INSTALL_ONLY_DEPLOY_OSM" - echo "INSTALL_ONLY_DOCKER_CE=$INSTALL_ONLY_DOCKER_CE" - echo "INSTALL_ONLY_K8S_CLUSTER=$INSTALL_ONLY_K8S_CLUSTER" echo "OSM_DEVOPS=$OSM_DEVOPS" echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG" echo "OSM_K8S_EXTERNAL_IP=$OSM_K8S_EXTERNAL_IP" @@ -653,10 +648,6 @@ REPOSITORY="testing" INSTALL_K8S_MONITOR="" LXD_REPOSITORY_BASE="https://osm-download.etsi.org/repository/osm/lxd" LXD_REPOSITORY_PATH="" -INSTALL_ONLY="" -INSTALL_ONLY_DEPLOY_OSM="" -INSTALL_ONLY_DOCKER_CE="" -INSTALL_ONLY_K8S_CLUSTER="" INSTALL_DOCKER="" INSTALL_JUJU="" INSTALL_NOHOSTCLIENT="" @@ -731,13 +722,6 @@ while getopts ":a:c:e:r:n:k:u:R:D:o:O:N:H:S:s:t:U:P:A:l:L:K:d:p:T:f:F:G:M:-: hy" D) OSM_DEVOPS="${OPTARG}" ;; - o) - INSTALL_ONLY="y" - [ "${OPTARG}" == "k8s_monitor" ] && INSTALL_K8S_MONITOR="y" && continue - [ "${OPTARG}" == "docker" ] && INSTALL_ONLY_DOCKER_CE="y" && continue - [ "${OPTARG}" == "k8scluster" ] && INSTALL_ONLY_K8S_CLUSTER="y" && continue - [ "${OPTARG}" == "deploy-osm" ] && INSTALL_ONLY_DEPLOY_OSM="y" && continue - ;; H) OSM_VCA_HOST="${OPTARG}" ;; @@ -873,15 +857,6 @@ os_info="${os_distro}_${os_release}" os_info="${os_info// /_}" # Community_installer -# Special cases go first -if [ -n "$INSTALL_ONLY" ]; then - setup_external_ip - [ -n "$INSTALL_ONLY_DOCKER_CE" ] && install_docker_ce - [ -n "$INSTALL_ONLY_K8S_CLUSTER" ] && install_k8s_cluster - [ -n "$INSTALL_K8S_MONITOR" ] && install_k8s_monitoring - [ -n "$INSTALL_ONLY_DEPLOY_OSM" ] && deploy_osm - echo -e "\nDONE" && exit 0 -fi # This is where installation starts install_osm echo -e "\nDONE" diff --git a/installers/install_osm.sh b/installers/install_osm.sh index efc3f612..816f39d2 100755 --- a/installers/install_osm.sh +++ b/installers/install_osm.sh @@ -41,7 +41,6 @@ function usage(){ echo -e " -S use VCA/juju secret key" echo -e " -P use VCA/juju public key file" echo -e " -A use VCA/juju API proxy" - echo -e " -o : ONLY installs the specified component (k8s_monitor, ng-sa, k8scluster, docker, deploy-osm)" echo -e " -w : Location to store runtime installation" echo -e " -l: LXD cloud yaml file" echo -e " -L: LXD credentials yaml file" -- 2.25.1