From: Harry Huang <huangxiangyu5@huawei.com>
Date: Mon, 26 Jun 2017 04:22:59 +0000 (+0800)
Subject: Adjust redeploy
X-Git-Tag: opnfv-5.0.0~55
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F36479%2F3;p=compass4nfv.git

Adjust redeploy

When deployment is interrupted (e.g. ctrl+c kill deploy.sh),
ansible processes in compass-tasks are still running. Redeploy
at this situation new ansible process will be affacted by
remained ones which cause errors.

Change-Id: I821445bd53397c7030145bf6dc925032cb42519c
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---

diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh
index 42fca803..971db056 100755
--- a/deploy/compass_vm.sh
+++ b/deploy/compass_vm.sh
@@ -93,6 +93,8 @@ function inject_compass_conf() {
 function refresh_compass_core () {
     sudo docker exec compass-deck bash -c "/opt/compass/bin/manage_db.py createdb"
     sudo docker exec compass-deck bash -c "/root/compass-deck/bin/clean_installers.py"
+    sudo docker exec compass-tasks bash -c \
+    "ps aux | grep -E '[a]nsible-playbook|[o]penstack-ansible' | awk '{print \$2}' | xargs kill -9"
     sudo rm -rf $WORK_DIR/docker/ansible/run/*
 }