diff options
| author |   Justin chi <chigang@huawei.com> | 2017-03-27 13:27:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-27 13:27:54 +0000 |
| commit | d52a11770689f4fd4d2bc4b9bf8dc09d4dd62ebf (patch) | |
| tree | 1a36a5857e95419bfcdfba86ea09093b44f8626b /deploy | |
| parent | c79c539411bec3da60bf60cb41906c63c1184ce5 (diff) | |
| parent | 88a7278e949b7a4bb777d9f36f0e27eade2b46d6 (diff) | |
Merge "opera adapter fix2"
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 |