From: Lusheng Ji <lji@research.att.com>
Date: Mon, 16 Oct 2017 02:17:30 +0000 (-0400)
Subject: Add a hook for teardown to stop installer inf loop
X-Git-Tag: v1.1.0~16
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c37f51bb5a5d9cfc44a8e52eca1fcf231f04da04;p=dcaegen2%2Fdeployments.git

Add a hook for teardown to stop installer inf loop

Issue-Id: DCAEGEN2-127
Change-Id: I7396a17049fb3186203f48f0f57e77ef135c8dff
Signed-off-by: Lusheng Ji <lji@research.att.com>
---

diff --git a/bootstrap/installer-docker.sh-template b/bootstrap/installer-docker.sh-template
index 5284837..9900d06 100755
--- a/bootstrap/installer-docker.sh-template
+++ b/bootstrap/installer-docker.sh-template
@@ -401,7 +401,8 @@ cfy install -p ./blueprints/ph/${PHBP} -b policy_handler_BP -d policy_handler -i
 
 
 # Keep the container up
-while true
+rm -f /tmp/ready_to_exit
+while [ ! -e /tmp/ready_to_exit ]
 do
-    sleep 300
+    sleep 30
 done
diff --git a/bootstrap/teardown.sh b/bootstrap/teardown.sh
index 47508d1..4d1836c 100755
--- a/bootstrap/teardown.sh
+++ b/bootstrap/teardown.sh
@@ -22,6 +22,9 @@
 #
 set -x
 set -e
+
+rm -f /tmp/ready_to_exit
+
 source ./dcaeinstall/bin/activate
 cd ./consul
 cfy status
@@ -37,3 +40,4 @@ cfy uninstall -d consul
 cd ..
 cfy local uninstall
 
+touch /tmp/ready_to_exit