projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix default installer to make local cluster pull images from docker proxy
[osm/devops.git]
/
installers
/
uninstall_osm.sh
diff --git
a/installers/uninstall_osm.sh
b/installers/uninstall_osm.sh
index
3af413b
..
eac9b80
100755
(executable)
--- a/
installers/uninstall_osm.sh
+++ b/
installers/uninstall_osm.sh
@@
-56,7
+56,7
@@
function uninstall_osm() {
# uninstall OSM MONITORING
uninstall_k8s_monitoring
fi
# uninstall OSM MONITORING
uninstall_k8s_monitoring
fi
- remove_k8s_namespace $OSM_
STACK_NAM
E
+ remove_k8s_namespace $OSM_
NAMESPAC
E
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
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
@@
EONG
sg docker -c "docker image rm ${DOCKER_REGISTRY_URL}${DOCKER_USER}/ng-ui:${OSM_DOCKER_TAG}"
sg docker -c "docker image rm ${DOCKER_REGISTRY_URL}${DOCKER_USER}/ng-ui:${OSM_DOCKER_TAG}"
- OSM_NAMESPACE_VOL="${OSM_HOST_VOL}/${OSM_
STACK_NAM
E}"
+ OSM_NAMESPACE_VOL="${OSM_HOST_VOL}/${OSM_
NAMESPAC
E}"
remove_volumes $OSM_NAMESPACE_VOL
echo "Removing $OSM_DOCKER_WORK_DIR"
sudo rm -rf $OSM_DOCKER_WORK_DIR
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_NAM
E"
+ [ -z "$CONTROLLER_NAME" ] && sg lxd -c "juju kill-controller -t 0 -y $OSM_
NAMESPAC
E"
remove_crontab_job
remove_crontab_job
@@
-147,7
+147,7
@@
OSM_VCA_SECRET=
OSM_VCA_PUBKEY=
OSM_VCA_CLOUDNAME="localhost"
OSM_VCA_K8S_CLOUDNAME="k8scloud"
OSM_VCA_PUBKEY=
OSM_VCA_CLOUDNAME="localhost"
OSM_VCA_K8S_CLOUDNAME="k8scloud"
-OSM_
STACK_NAM
E=osm
+OSM_
NAMESPAC
E=osm
NO_HOST_PORTS=""
DOCKER_NOBUILD=""
REPOSITORY_KEY="OSM%20ETSI%20Release%20Key.gpg"
NO_HOST_PORTS=""
DOCKER_NOBUILD=""
REPOSITORY_KEY="OSM%20ETSI%20Release%20Key.gpg"
@@
-156,7
+156,7
@@
OSM_WORK_DIR="/etc/osm"
OSM_DOCKER_WORK_DIR="/etc/osm/docker"
OSM_K8S_WORK_DIR="${OSM_DOCKER_WORK_DIR}/osm_pods"
OSM_HOST_VOL="/var/lib/osm"
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_NAM
E}"
+OSM_NAMESPACE_VOL="${OSM_HOST_VOL}/${OSM_
NAMESPAC
E}"
OSM_DOCKER_TAG=latest
DOCKER_USER=opensourcemano
PULL_IMAGES="y"
OSM_DOCKER_TAG=latest
DOCKER_USER=opensourcemano
PULL_IMAGES="y"
@@
-250,7
+250,7
@@
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;
OSM_VCA_SECRET="${OPTARG}"
;;
s)
OSM_VCA_SECRET="${OPTARG}"
;;
s)
- OSM_
STACK_NAM
E="${OPTARG}" && [[ ! "${OPTARG}" =~ $RE_CHECK ]] && echo "Namespace $OPTARG is invalid. Regex used for validation is $RE_CHECK" && exit 0
+ OSM_
NAMESPAC
E="${OPTARG}" && [[ ! "${OPTARG}" =~ $RE_CHECK ]] && echo "Namespace $OPTARG is invalid. Regex used for validation is $RE_CHECK" && exit 0
;;
t)
OSM_DOCKER_TAG="${OPTARG}"
;;
t)
OSM_DOCKER_TAG="${OPTARG}"