summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-03-27 06:19:06 +0000
committerJustin chi <chigang@huawei.com>2017-03-27 06:19:06 +0000
commitb52dade4c2d8ee662f22893c9527196e0074b20d (patch)
tree4d04d521b0aacf9ff3ef555fb071cee83747b2be
parentfb5c383c7d88f27c5dcea3b4b1920ffd612cae2e (diff)
Revert "opera adapter fix2"
* opera_adapter need sshpass which may cause deploy fail * compass log redirection is the last command which always return 0 and thus cover deploy error 1. add installation of sshpass in prepare.sh 2. echo a string at the end of deploy/launch.sh into log file to judge if deployment is complete 3. fix typing error in util/check_valid.py Change-Id: Ifa57faed29e1055a35ab0e24b0026b520f395807 Signed-off-by: Justin chi <chigang@huawei.com>
-rwxr-xr-xdeploy.sh6
-rwxr-xr-xdeploy/launch.sh2
-rwxr-xr-xdeploy/prepare.sh2
-rw-r--r--util/check_valid.py4
4 files changed, 3 insertions, 11 deletions
diff --git a/deploy.sh b/deploy.sh
index e29b518f..891eadf9 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -39,12 +39,6 @@ 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 3e523adb..5f1ee1cb 100755
--- a/deploy/launch.sh
+++ b/deploy/launch.sh
@@ -147,5 +147,3 @@ if [[ ${DHA##*/} =~ "openo" ]]; then
exit 1
fi
fi
-
-echo 'compass deploy success'
diff --git a/deploy/prepare.sh b/deploy/prepare.sh
index b7e5bfa1..c2023223 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 sshpass
+ sudo apt-get install -y --force-yes git python-dev python-pip figlet
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
diff --git a/util/check_valid.py b/util/check_valid.py
index e3ad6bcd..9eaa100d 100644
--- a/util/check_valid.py
+++ b/util/check_valid.py
@@ -135,7 +135,7 @@ if __name__ == "__main__":
_, dha_file, network_file = sys.argv
if not os.path.exists(dha_file):
- err_print("DHA file doesn't exist")
+ err_print("DHA file doesn't exit")
sys.exit(1)
else:
dha = load_file(dha_file)
@@ -148,7 +148,7 @@ if __name__ == "__main__":
has_invalid = True
if not os.path.exists(network_file):
- err_print("NETWORK file doesn't exist")
+ err_print("NETWORK file doesn't exit")
sys.exit(1)
else:
network = load_file(network_file)