From dd3335128617003db15e46378ed0baf7941c369c Mon Sep 17 00:00:00 2001
From: zhouya <zhou.ya@zte.com.cn>
Date: Thu, 2 Mar 2017 10:41:15 +0800
Subject: fix some bug of bm deploy

Change-Id: I96bed7259666d48a1fbc41bb9452d8493c4417b8
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
---
 ci/deploy/deploy.sh                          | 12 ++++++------
 deploy/check_openstack_progress.sh           |  4 ++--
 deploy/check_os_progress.sh                  |  7 +++++++
 templates/physical_environment/vms/daisy.xml |  5 ++---
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index e7aba37b..aaa37259 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -257,8 +257,11 @@ function clean_up
 echo "=====clean up all node and network======"
 if [ $IS_BARE == 0 ];then
     clean_up all_in_one daisy2
+    clean_up daisy daisy1
+else
+    virsh destroy daisy
+    virsh undefine daisy
 fi
-clean_up daisy daisy1
 if [ -f $WORKDIR/daisy/centos7.qcow2 ]; then
     rm -rf $WORKDIR/daisy/centos7.qcow2
 fi
@@ -269,7 +272,8 @@ if [ $IS_BARE == 0 ];then
     create_node $daisy_server_net daisy1 $vmdeploy_daisy_server_vm daisy
 else
     $create_qcow2_path/daisy-img-modify.sh -c $create_qcow2_path/centos-img-modify.sh -a $DAISY_IP $PARAS_IMAGE
-    create_node $bmdeploy_daisy_server_net daisy1 $bmdeploy_daisy_server_vm daisy
+    virsh define $bmdeploy_daisy_server_vm
+    virsh start daisy
 fi
 sleep 20
 
@@ -317,10 +321,6 @@ if [ $IS_BARE == 0 ];then
     virsh start all_in_one
 fi
 
-echo "============restart daisy service==========="
-ssh $SSH_PARAS $DAISY_IP "systemctl restart daisy-api"
-ssh $SSH_PARAS $DAISY_IP "systemctl restart daisy-registry"
-
 echo "===========check install progress==========="
 ssh $SSH_PARAS $DAISY_IP "${REMOTE_SPACE}/deploy/check_os_progress.sh -d $IS_BARE -n $TARGET_HOSTS_NUM"
 if [ $? -ne 0 ]; then
diff --git a/deploy/check_openstack_progress.sh b/deploy/check_openstack_progress.sh
index bbd631b6..e50eb332 100755
--- a/deploy/check_openstack_progress.sh
+++ b/deploy/check_openstack_progress.sh
@@ -23,8 +23,8 @@ while true; do
         tail -n 200 /var/log/daisy/kolla_$cluster_id*
         exit 1
     else
-        progress=`daisy host-list --cluster-id $cluster_id |grep DISCOVERY_SUCCESSFUL |awk -F "|" '{print $11}'|sed s/[[:space:]]//g`
-        echo " openstack in installing , progress is $progress%"
+        progress=`daisy host-list --cluster-id $cluster_id |grep DISCOVERY_SUCCESSFUL |awk -F "|" '{print $11}'|sed s/[[:space:]]//g|sed ':a;N;$ s/\n/ /g;ba'`
+        echo " openstack in installing , progress of each node is $progress%"
         sleep 30
     fi
 done
diff --git a/deploy/check_os_progress.sh b/deploy/check_os_progress.sh
index c631a713..b7b05700 100755
--- a/deploy/check_os_progress.sh
+++ b/deploy/check_os_progress.sh
@@ -36,10 +36,17 @@ done
 
 source /root/daisyrc_admin
 cluster_id=`daisy cluster-list | awk -F "|" '{print $2}' | sed -n '4p'`
+hosts_id=`daisy host-list | awk -F "|" '{print $2}'| grep -o "[^ ]\+\( \+[^ ]\+\)*"|tail -n +2`
 skip=false
 if [ $deploy_env == 0 ];then
     skip=true
+    for host_id in $hosts_id;
+    do
+            echo "update host $host_id ipmi user and passwd"
+            daisy host-update $host_id --ipmi-user zteroot --ipmi-passwd superuser
+    done
 fi
+echo "update all hosts ipmi user and passwd ok!"
 
 echo "run daisy install command"
 daisy install $cluster_id --skip-pxe-ipmi $skip
diff --git a/templates/physical_environment/vms/daisy.xml b/templates/physical_environment/vms/daisy.xml
index e91acc46..574669bf 100644
--- a/templates/physical_environment/vms/daisy.xml
+++ b/templates/physical_environment/vms/daisy.xml
@@ -71,9 +71,8 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </controller>
     <interface type='bridge'>
-      <mac address='52:54:00:73:8b:50'/>
-      <source bridge='daisy1'/>
-      <target dev='vnet1'/>
+      <source bridge='br7'/>
+      <target dev='vnet0'/>
       <model type='rtl8139'/>
       <alias name='net0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-- 
cgit 1.2.3-korg