From 8f307233248edcd8d191f7bbb113330170638a72 Mon Sep 17 00:00:00 2001
From: Harry Huang <huangxiangyu5@huawei.com>
Date: Wed, 29 Mar 2017 17:30:15 +0800
Subject: Fix some opera related error

1. echo a string to compass log to avoid deploy error
bing concealed
2. judge return code of ./opera_launch.sh

Change-Id: I7ac2bac9b600f289c01116e7f7777d1219a58eb2
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
---
 deploy.sh               | 6 ++++++
 deploy/launch.sh        | 5 ++++-
 deploy/opera_adapter.py | 9 ++++++---
 deploy/prepare.sh       | 2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 891eadf9..e29b518f 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -39,6 +39,12 @@ if [[ -z $DEPLOY_COMPASS && -z $DEPLOY_HOST && -z $REDEPLOY_HOST ]]; then
 fi
 
 LOG_DIR=$COMPASS_DIR/work/deploy/log
+export LOG_DIR
+
 mkdir -p $LOG_DIR
 
 $COMPASS_DIR/deploy/launch.sh $* 2>&1 | tee $LOG_DIR/compass-deploy.log
+
+if [[ $(tail -1 $LOG_DIR/compass-deploy.log) != 'compass deploy success' ]]; then
+    exit 1
+fi
diff --git a/deploy/launch.sh b/deploy/launch.sh
index 5f1ee1cb..51094b29 100755
--- a/deploy/launch.sh
+++ b/deploy/launch.sh
@@ -142,8 +142,11 @@ echo "NOTE: openrc file is in the controller nodes"
 echo ""
 
 if [[ ${DHA##*/} =~ "openo" ]]; then
-    sudo python ${COMPASS_DIR}/deploy/opera_adapter.py $DHA $NETWORK
+    python ${COMPASS_DIR}/deploy/opera_adapter.py $DHA $NETWORK
     if [[ $? -ne 0 ]]; then
+        log_error 'opera launch failed'
         exit 1
     fi
 fi
+
+echo 'compass deploy success'
diff --git a/deploy/opera_adapter.py b/deploy/opera_adapter.py
index 71f19951..137aba54 100644
--- a/deploy/opera_adapter.py
+++ b/deploy/opera_adapter.py
@@ -76,14 +76,14 @@ if __name__ == "__main__":
     compass_dir = os.getenv('COMPASS_DIR')
 
     if not compass_dir:
-        print("env var COMPASS_DIR  doesn't exit")
+        print("env var COMPASS_DIR  doesn't exist")
         sys.exit(1)
 
     if not os.path.exists(dha_file):
-        print("DHA file doesn't exit")
+        print("DHA file doesn't exist")
         sys.exit(1)
     if not os.path.exists(network_file):
-        print("NETWORK file doesn't exit")
+        print("NETWORK file doesn't exist")
         sys.exit(1)
 
     dha = load_file(dha_file)
@@ -121,3 +121,6 @@ if __name__ == "__main__":
 
     p2 = subprocess.Popen("./opera_launch.sh", cwd=opera_dir, shell=True)
     p2.communicate()
+    if p2.returncode != 0:
+        print('./opera_launch.sh fail')
+        sys.exit(1)
diff --git a/deploy/prepare.sh b/deploy/prepare.sh
index c2023223..b7e5bfa1 100755
--- a/deploy/prepare.sh
+++ b/deploy/prepare.sh
@@ -74,7 +74,7 @@ function  _prepare_python_env() {
         else
              sudo apt-get update -y
              sudo apt-get install -y --force-yes mkisofs bc curl ipmitool openvswitch-switch
-             sudo apt-get install -y --force-yes git python-dev python-pip figlet
+             sudo apt-get install -y --force-yes git python-dev python-pip figlet sshpass
              sudo apt-get install -y --force-yes libxslt-dev libxml2-dev libvirt-dev build-essential qemu-utils qemu-kvm libvirt-bin virtinst libmysqld-dev
              sudo apt-get install -y --force-yes libffi-dev libssl-dev
 
-- 
cgit 1.2.3-korg