commit 325032a38c3cb0f433832e63241fa0a5ce5d95ea
author garciadeblas <gerardo.garciadeblas@telefonica.com> Thu Apr 13 18:07:44 2023 +0200
committer garciadeblas <gerardo.garciadeblas@telefonica.com> Thu Apr 13 18:09:18 2023 +0200
tree fb92e4c2b1942c7b26355730587a53e1ef27eff3
parent 4c246cfd7065f2a06191e97e0d7970ef2ffaf1f9

Replace OSM_STACK_NAME by OSM_NAMESPACE in installers scripts

Change-Id: I5ce4bdc392fd64b4bed7479768b91adba53c67e4
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

installers/uninstall_osm.sh

diff --git a/installers/uninstall_osm.sh b/installers/uninstall_osm.sh
index 3af413b..eac9b80 100755
--- a/installers/uninstall_osm.sh
+++ b/installers/uninstall_osm.sh
@@ -56,7 +56,7 @@
         # uninstall OSM MONITORING
         uninstall_k8s_monitoring
     fi
-    remove_k8s_namespace $OSM_STACK_NAME
+    remove_k8s_namespace $OSM_NAMESPACE
     echo "Now osm docker images and volumes will be deleted"
     # TODO: clean-up of images should take into account if other tags were used for specific modules
     newgrp docker << EONG
@@ -67,12 +67,12 @@
 
     sg docker -c "docker image rm ${DOCKER_REGISTRY_URL}${DOCKER_USER}/ng-ui:${OSM_DOCKER_TAG}"
 
-    OSM_NAMESPACE_VOL="${OSM_HOST_VOL}/${OSM_STACK_NAME}"
+    OSM_NAMESPACE_VOL="${OSM_HOST_VOL}/${OSM_NAMESPACE}"
     remove_volumes $OSM_NAMESPACE_VOL
 
     echo "Removing $OSM_DOCKER_WORK_DIR"
     sudo rm -rf $OSM_DOCKER_WORK_DIR
-    [ -z "$CONTROLLER_NAME" ] && sg lxd -c "juju kill-controller -t 0 -y $OSM_STACK_NAME"
+    [ -z "$CONTROLLER_NAME" ] && sg lxd -c "juju kill-controller -t 0 -y $OSM_NAMESPACE"
 
     remove_crontab_job
 
@@ -147,7 +147,7 @@
 OSM_VCA_PUBKEY=
 OSM_VCA_CLOUDNAME="localhost"
 OSM_VCA_K8S_CLOUDNAME="k8scloud"
-OSM_STACK_NAME=osm
+OSM_NAMESPACE=osm
 NO_HOST_PORTS=""
 DOCKER_NOBUILD=""
 REPOSITORY_KEY="OSM%20ETSI%20Release%20Key.gpg"
@@ -156,7 +156,7 @@
 OSM_DOCKER_WORK_DIR="/etc/osm/docker"
 OSM_K8S_WORK_DIR="${OSM_DOCKER_WORK_DIR}/osm_pods"
 OSM_HOST_VOL="/var/lib/osm"
-OSM_NAMESPACE_VOL="${OSM_HOST_VOL}/${OSM_STACK_NAME}"
+OSM_NAMESPACE_VOL="${OSM_HOST_VOL}/${OSM_NAMESPACE}"
 OSM_DOCKER_TAG=latest
 DOCKER_USER=opensourcemano
 PULL_IMAGES="y"
@@ -250,7 +250,7 @@
             OSM_VCA_SECRET="${OPTARG}"
             ;;
         s)
-            OSM_STACK_NAME="${OPTARG}" && [[ ! "${OPTARG}" =~ $RE_CHECK ]] && echo "Namespace $OPTARG is invalid. Regex used for validation is $RE_CHECK" && exit 0
+            OSM_NAMESPACE="${OPTARG}" && [[ ! "${OPTARG}" =~ $RE_CHECK ]] && echo "Namespace $OPTARG is invalid. Regex used for validation is $RE_CHECK" && exit 0
             ;;
         t)
             OSM_DOCKER_TAG="${OPTARG}"