diff options
author | Justin chi <chigang@huawei.com> | 2017-03-27 06:19:06 +0000 |
---|---|---|
committer | Justin chi <chigang@huawei.com> | 2017-03-27 06:19:06 +0000 |
commit | b52dade4c2d8ee662f22893c9527196e0074b20d (patch) | |
tree | 4d04d521b0aacf9ff3ef555fb071cee83747b2be /deploy | |
parent | fb5c383c7d88f27c5dcea3b4b1920ffd612cae2e (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>
Diffstat (limited to 'deploy')
-rwxr-xr-x | deploy/launch.sh | 2 | ||||
-rwxr-xr-x | deploy/prepare.sh | 2 |
2 files changed, 1 insertions, 3 deletions
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 |