X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fdcae2_serv.sh;h=a86906a3a2e134206231f3938ca6e30130b32be5;hb=420b01ef3ec000d9e1c8ff42e904c71445577bb7;hp=bfd2ad18159cee7e5224ae7947702a26e840c71f;hpb=ba2ea344e2a3335739cee2eb1dcb6f1454f58a3a;p=demo.git

diff --git a/boot/dcae2_serv.sh b/boot/dcae2_serv.sh
index bfd2ad18..a86906a3 100644
--- a/boot/dcae2_serv.sh
+++ b/boot/dcae2_serv.sh
@@ -1,4 +1,4 @@
-
+#!/bin/sh
 #############################################################################
 #
 # Copyright © 2017 AT&T Intellectual Property. All rights reserved.
@@ -16,7 +16,6 @@
 #
 #############################################################################
 
-#!/bin/sh
 ### BEGIN INIT INFO
 # Provides:
 # Required-Start:    $remote_fs $syslog
@@ -31,7 +30,7 @@ dir="/opt"
 cmd="./dcae2_vm_init.sh"
 user="root"
 
-name=`basename $0`
+name=$(basename "$0")
 pid_file="/var/run/$name.pid"
 stdout_log="/var/log/$name.log"
 stderr_log="/var/log/$name.err"
@@ -41,7 +40,8 @@ get_pid() {
 }
 
 is_running() {
-    [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1
+    CID="$(docker ps | grep 'org.onap.dcaegen2.deployments.bootstrap')"
+    [ ! -z "$CID" ]
 }
 
 case "$1" in
@@ -66,7 +66,12 @@ case "$1" in
     stop)
     if is_running; then
         echo -n "Stopping $name.."
-        kill `get_pid`
+        kill "$(get_pid)"
+        CID=$(docker ps | grep 'nginx' | awk '{ print $1 }')
+        sudo docker stop "$CID"
+
+        CID=$(docker ps | grep 'org.onap.dcaegen2.deployments.bootstrap' | awk '{ print $1 }')
+        docker exec -it "$CID" ./teardown.sh
         for i in {1..10}
         do
             if ! is_running; then