diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2017-03-23 15:52:09 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2017-03-27 14:29:28 +0800 |
| commit | 88a7278e949b7a4bb777d9f36f0e27eade2b46d6 (patch) | |
| tree | 0d6ff95298059558115e028d3bd105e61af11078 /deploy | |
| parent | 366a89b97863c820a063b62609fa88142550a2f5 (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-x | deploy/launch.sh | 2 | ||||
| -rw-r--r-- | deploy/opera_adapter.py | 2 | ||||
| -rwxr-xr-x | deploy/prepare.sh | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/deploy/launch.sh b/deploy/launch.sh index 51b502f2..51094b29 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -148,3 +148,5 @@ if [[ ${DHA##*/} =~ "openo" ]]; then exit 1 fi fi + +echo 'compass deploy success' diff --git a/deploy/opera_adapter.py b/deploy/opera_adapter.py index f83638d7..137aba54 100644 --- a/deploy/opera_adapter.py +++ b/deploy/opera_adapter.py @@ -119,7 +119,7 @@ if __name__ == "__main__": dump_file(openo_config, openo_config_file) sync_admin_openrc(network, admin_openrc_file) - p2 = subprocess.Popen("sudo ./opera_launch.sh", cwd=opera_dir, shell=True) + p2 = subprocess.Popen("./opera_launch.sh", cwd=opera_dir, shell=True) p2.communicate() if p2.returncode != 0: print('./opera_launch.sh fail') 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 |