Send both ubuntu versions to Robot VM

[demo.git] / boot / dcae2_serv.sh

diff --git a/boot/dcae2_serv.sh b/boot/dcae2_serv.sh
index bfd2ad1..30e647e 100644 (file)
--- a/boot/dcae2_serv.sh
+++ b/boot/dcae2_serv.sh
@@ -1,7 +1,7 @@
-
+#!/bin/sh
 #############################################################################
 #
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,22 +16,21 @@
 #
 #############################################################################
 
-#!/bin/sh
 ### BEGIN INIT INFO
-# Provides:
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
+# Provides: dcaegen2-bootstrap
+# Required-Start: $remote_fs $syslog
+# Required-Stop: $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
 # Short-Description: Start daemon at boot time
-# Description:       Enable service provided by daemon.
+# Description: Enable service provided by daemon.
 ### END INIT INFO
 
 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