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 <yangyang1@zte.com.cn>

diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index 9fca122..b2802c5 100755 (executable)
--- 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 6e626c7..263e62e 100644 (file)
--- 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: