From 59f1796fd0488926ede5b47279c1e672bda7e35b Mon Sep 17 00:00:00 2001 From: Alex Yang Date: Sun, 26 Mar 2017 22:01:43 +0800 Subject: Fix bug in virtual deploy In prepare_install function of tempest.py: 1. get_config.py needs dha and network parameters 2. install_os_for_vm_step2 function needs cluster_id parameter Change-Id: Idb13f71ced76f0d99dcbe818cdac3d3f2eb7d5df Signed-off-by: Alex Yang --- ci/deploy/deploy.sh | 2 +- deploy/tempest.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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: -- cgit 1.2.3-korg