diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-03-28 02:23:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-28 02:23:05 +0000 |
| commit | 3324525378940af1f53c75a264d3945382dfe623 (patch) | |
| tree | 0dc7d9d6e408ca39281a44a7f31047bc297f90ce | |
| parent | 9b44406394c56b4d162e3feae6282777a63b5ec0 (diff) | |
| parent | 59f1796fd0488926ede5b47279c1e672bda7e35b (diff) | |
Merge "Fix bug in virtual deploy"
| -rwxr-xr-x | ci/deploy/deploy.sh | 2 | ||||
| -rw-r--r-- | deploy/tempest.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 9fca1220..b2802c5d 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -321,7 +321,7 @@ if [ $IS_BARE == 0 ];then virsh destroy all_in_one virsh start all_in_one sleep 20 - ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py --install 'yes'" + ssh $SSH_PARAS $DAISY_IP "python ${REMOTE_SPACE}/deploy/tempest.py --dha $DHA --network $NETWORK --install 'yes'" fi echo "===========check install progress===========" diff --git a/deploy/tempest.py b/deploy/tempest.py index 6e626c71..263e62e0 100644 --- a/deploy/tempest.py +++ b/deploy/tempest.py @@ -94,6 +94,8 @@ def prepare_install(): print("daisy baremetal deploy start") install_os_for_bm_oneshot(cluster_id) elif conf['install'] and conf['install'] == 'yes': + cluster_info = get_cluster() + cluster_id = cluster_info.id install_os_for_vm_step2(cluster_id) except Exception: |