diff options
| author |   Lusheng Ji <lji@research.att.com> | 2017-10-20 18:22:38 -0400 |
|---|---|---|
| committer | Lusheng Ji <lji@research.att.com> | 2017-10-22 20:18:59 -0400 |
| commit | 8ddf3e163f1931907e20addb60a4c9af21e5e9c5 (patch) | |
| tree | bf20e522d6fbc4f2d7b8e77e90d698755b03f66f /boot/dcae2_serv.sh | |
| parent | fa50c94f97973ef513d64c5352006f24f7229cfb (diff) | |
Add proxying healthcheck to consul etc
Changes are for:
1. Proxying healthcheck API call to Consul's health API using a Nginx
container proxy. Also some code cleanup.
2. Add support for posting floating addresses to Designate DNS
3. Add addition parameters in heat for supporting spinning up DCAE in
a separate OS/tenant (due to lack of Designate support in main Integration
OS/tenant)
Issue-Id: DCAEGEN2-127
Change-Id: Iac66eddbdd1dfadfc92bf2a1e372c6ad55bd0ab1
Signed-off-by: Lusheng Ji <lji@research.att.com>
Diffstat (limited to 'boot/dcae2_serv.sh')
| -rw-r--r-- | boot/dcae2_serv.sh | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/boot/dcae2_serv.sh b/boot/dcae2_serv.sh index b81c57a4..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,8 +40,8 @@ get_pid() { } is_running() { - #[ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1 - [ ! -z $(docker ps | grep 'org.onap.dcaegen2.deployments.bootstrap') ] + CID="$(docker ps | grep 'org.onap.dcaegen2.deployments.bootstrap')" + [ ! -z "$CID" ] } case "$1" in @@ -67,9 +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 + docker exec -it "$CID" ./teardown.sh for i in {1..10} do if ! is_running; then |