Feature 11071: Modular OSM installation. Remove partial installation of components
Change-Id: Iae20aa7c4704ee8f26e447da7cd9e56d50b900a4
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index b465ff4..f0723ea 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -37,7 +37,6 @@
echo -e " -S <VCA secret> use VCA/juju secret key"
echo -e " -P <VCA pubkey> use VCA/juju public key file"
echo -e " -A <VCA apiproxy> use VCA/juju API proxy"
- echo -e " -o <COMPONENT>: ONLY installs the specified component (k8s_monitor, ng-sa, k8scluster, docker, deploy-osm)"
echo -e " -w <work dir>: Location to store runtime installation"
echo -e " -l: LXD cloud yaml file"
echo -e " -L: LXD credentials yaml file"
@@ -597,10 +596,6 @@
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 @@
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 @@
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_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 efc3f61..816f39d 100755
--- a/installers/install_osm.sh
+++ b/installers/install_osm.sh
@@ -41,7 +41,6 @@
echo -e " -S <VCA secret> use VCA/juju secret key"
echo -e " -P <VCA pubkey> use VCA/juju public key file"
echo -e " -A <VCA apiproxy> use VCA/juju API proxy"
- echo -e " -o <COMPONENT>: ONLY installs the specified component (k8s_monitor, ng-sa, k8scluster, docker, deploy-osm)"
echo -e " -w <work dir>: Location to store runtime installation"
echo -e " -l: LXD cloud yaml file"
echo -e " -L: LXD credentials yaml file"