From: lavado <glavado@whitestack.com>
Date: Wed, 28 Nov 2018 16:30:48 +0000 (-0500)
Subject: Minor corrections to uninstall_lightweight functions
X-Git-Tag: v5.0.0~3
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=02ad4b008202ad107a842caa5c5f4139dd9854c8;p=osm%2Fdevops.git

Minor corrections to uninstall_lightweight functions

Removes old references to kafka-exporter container
Replaces osm/pm for osm/pol
Adds OSM_DOCKER_TAG for proper image deletion

Change-Id: If2544bcdbadfa29f47a9e4f4f3ed1ce47fb87dc7
Signed-off-by: lavado <glavado@whitestack.com>
---

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 10b6a58c..a345b79a 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -157,7 +157,6 @@ function uninstall_lightweight() {
         if [ -n "$INSTALL_PERFMON" ]; then
             echo -e "\nUninstalling OSM Performance Monitoring stack"
             remove_stack osm_metrics
-            sg docker -c "docker image rm osm/kafka-exporter"
             $WORKDIR_SUDO rm -rf $OSM_DOCKER_WORK_DIR/osm_metrics
         fi
     else
@@ -167,14 +166,14 @@ function uninstall_lightweight() {
         remove_stack osm_metrics
         echo "Now osm docker images and volumes will be deleted"
         newgrp docker << EONG
-        docker image rm ${DOCKER_USER}/ro
-        docker image rm ${DOCKER_USER}/lcm
-        docker image rm ${DOCKER_USER}/light-ui
-        docker image rm ${DOCKER_USER}/keystone
-        docker image rm ${DOCKER_USER}/nbi
-        docker image rm ${DOCKER_USER}/mon
-        docker image rm ${DOCKER_USER}/pm
-        docker image rm ${DOCKER_USER}/kafka-exporter
+        docker image rm ${DOCKER_USER}/ro:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/lcm:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/light-ui:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/keystone:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/nbi:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/mon:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/pol:${OSM_DOCKER_TAG}
+        docker image rm ${DOCKER_USER}/osmclient:${OSM_DOCKER_TAG}
 EONG
         remove_volumes $OSM_STACK_NAME
         remove_network $OSM_STACK_NAME