From: Adam Israel <adam.israel@canonical.com>
Date: Tue, 11 Jun 2019 14:28:43 +0000 (-0400)
Subject: Fix uninstall bug that leaves Juju controller running
X-Git-Tag: v6.0.0~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=843764e7102e07ca535b5fb0d94c0e8a02195be4;p=osm%2Fdevops.git

Fix uninstall bug that leaves Juju controller running

During uninstall, the Juju controller was not being destroyed when there
are active models. The `juju destroy-controller` command requires the
additional flag `--destroy-all-models`.

Change-Id: Ie5e3590027907ada08c6e6b2951a6f1ef64d41bf
Signed-off-by: Adam Israel <adam.israel@canonical.com>
---

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 40cbfdad..96ffdbe0 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -180,7 +180,7 @@ EONG
         remove_network $OSM_STACK_NAME
         echo "Removing $OSM_DOCKER_WORK_DIR"
         $WORKDIR_SUDO rm -rf $OSM_DOCKER_WORK_DIR
-        sg lxd -c "juju destroy-controller --yes $OSM_STACK_NAME"
+        sg lxd -c "juju destroy-controller --destroy-all-models --yes $OSM_STACK_NAME"
     fi
     echo "Some docker images will be kept in case they are used by other docker stacks"
     echo "To remove them, just run 'docker image prune' in a terminal"