X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_uninstall.sh;h=09305d2ad82cba31a8f4313113b8484688bd2a8d;hb=a4a37f7f9f5410ff2c7833b76bdc85f752c74849;hp=ef2b293cf3397b86961ce636f50a30741c416377;hpb=1a423a467dca38dab970ea9e0f7480be1f2dfc83;p=osm%2Fdevops.git

diff --git a/installers/charmed_uninstall.sh b/installers/charmed_uninstall.sh
index ef2b293c..09305d2a 100755
--- a/installers/charmed_uninstall.sh
+++ b/installers/charmed_uninstall.sh
@@ -14,7 +14,18 @@
 #
 
 
-juju destroy-model osm --destroy-storage -y
-juju destroy-model test --destroy-storage -y
+juju destroy-model osm --destroy-storage -y --force --no-wait
 sudo snap unalias osm
 sudo snap remove osmclient
+CONTROLLER_NAME="osm-vca"
+CONTROLLER_PRESENT=$(juju controllers 2>/dev/null| grep ${CONTROLLER_NAME} | wc -l)
+if [[ $CONTROLLER_PRESENT -ge 1 ]]; then
+    cat << EOF
+The VCA with the name "${CONTROLLER_NAME}" has been left in place to ensure that no other
+applications are using it.  If you are sure you wish to remove this controller,
+please execute the following command:
+
+   juju destroy-controller --release-storage --destroy-all-models -y ${CONTROLLER_NAME}
+
+EOF
+fi