diff options
author | Lusheng Ji <lji@research.att.com> | 2017-10-15 20:16:44 -0400 |
---|---|---|
committer | Lusheng Ji <lji@research.att.com> | 2017-10-16 02:41:49 +0000 |
commit | f79590758d6cce11b10d9257af798c8f8bc10f1e (patch) | |
tree | 708127efce9e1da738d8d3d0d867be85bedcabb9 /boot/dcae2_serv.sh | |
parent | 2c932329f5477040bc2c37b83d4e7d9f7e080137 (diff) |
Update dcae2 vm_init and intsall scripts
Issue-Id: DCAEGEN2-127
Change-Id: I4e8221972144495d9f121e4f5cfc775d141b15cb
Signed-off-by: Lusheng Ji <lji@research.att.com>
Diffstat (limited to 'boot/dcae2_serv.sh')
-rw-r--r-- | boot/dcae2_serv.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/boot/dcae2_serv.sh b/boot/dcae2_serv.sh index bfd2ad18..b81c57a4 100644 --- a/boot/dcae2_serv.sh +++ b/boot/dcae2_serv.sh @@ -41,7 +41,8 @@ get_pid() { } is_running() { - [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1 + #[ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1 + [ ! -z $(docker ps | grep 'org.onap.dcaegen2.deployments.bootstrap') ] } case "$1" in @@ -67,6 +68,8 @@ case "$1" in if is_running; then echo -n "Stopping $name.." kill `get_pid` + 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 |