Code Review
/
demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update dcae2 vm_init and intsall scripts
[demo.git]
/
boot
/
dcae2_serv.sh
diff --git
a/boot/dcae2_serv.sh
b/boot/dcae2_serv.sh
index
bfd2ad1
..
b81c57a
100644
(file)
--- a/
boot/dcae2_serv.sh
+++ b/
boot/dcae2_serv.sh
@@
-41,7
+41,8
@@
get_pid() {
}
is_running() {
}
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
}
case "$1" in
@@
-67,6
+68,8
@@
case "$1" in
if is_running; then
echo -n "Stopping $name.."
kill `get_pid`
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
for i in {1..10}
do
if ! is_running; then