summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2017-03-23 15:52:09 +0800
committerJustin chi <chigang@huawei.com>2017-03-24 13:00:06 +0000
commitfb5c383c7d88f27c5dcea3b4b1920ffd612cae2e (patch)
tree4abc4b2f17a6c3abcf14f3821eb07163f678ee2b /deploy
parented1767869c1e51200b91f5e7608a648d9cd2eadf (diff)
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: Ic4bca50b2c316bf46cace45b9b3317ef9452a0ba Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy')
-rwxr-xr-xdeploy/launch.sh2
-rwxr-xr-xdeploy/prepare.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/deploy/launch.sh b/deploy/launch.sh
index 5f1ee1cb..3e523adb 100755
--- a/deploy/launch.sh
+++ b/deploy/launch.sh
@@ -147,3 +147,5 @@ if [[ ${DHA##*/} =~ "openo" ]]; then
exit 1
fi
fi
+
+echo 'compass deploy success'
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