From 9c6ca57f518ded774b830e4051e630d8cad1d4eb Mon Sep 17 00:00:00 2001
From: zhouya <zhou.ya@zte.com.cn>
Date: Tue, 25 Apr 2017 14:42:01 +0800
Subject: [PATCH] modify daisy.conf sleep long for trustme modify cpumode

1.add multicast flag in daisy.conf
2.sleep40 for trustme.sh execute ok
3.modify cpu mode of xml file to make it much more general
4.fix check_openstack_progress parameter error

Change-Id: Ic150698ede448b7651e95d129aeb7d97a8f34309
Signed-off-by: zhouya <zhou.ya@zte.com.cn>
---
 ci/deploy/deploy.sh                                | 5 ++++-
 deploy/check_openstack_progress.sh                 | 2 +-
 deploy/daisy.conf                                  | 5 +++++
 templates/physical_environment/vms/daisy.xml       | 4 +---
 templates/virtual_environment/vms/all_in_one.xml   | 4 +---
 templates/virtual_environment/vms/computer01.xml   | 4 +---
 templates/virtual_environment/vms/computer02.xml   | 4 +---
 templates/virtual_environment/vms/controller01.xml | 4 +---
 templates/virtual_environment/vms/controller02.xml | 4 +---
 templates/virtual_environment/vms/controller03.xml | 4 +---
 templates/virtual_environment/vms/daisy.xml        | 4 +---
 11 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index c287f361..cc759149 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -269,7 +269,10 @@ else
     virsh define $BMDEPLOY_DAISY_SERVER_VM
     virsh start daisy
 fi
-sleep 20
+#wait for the daisy1 network start finished for execute trustme.sh
+#here sleep 40 just needed in Dell blade server
+#for E9000 blade server we only have to sleep 20
+sleep 40
 
 echo "====== install daisy ======"
 $DEPLOY_PATH/trustme.sh $DAISY_IP $DAISY_PASSWD
diff --git a/deploy/check_openstack_progress.sh b/deploy/check_openstack_progress.sh
index f0ab1e90..1f150896 100755
--- a/deploy/check_openstack_progress.sh
+++ b/deploy/check_openstack_progress.sh
@@ -8,7 +8,7 @@ OPTIONS:
   -n target node numbers
 
 EXAMPLE:
-    sudo `basename $0` -d 1 -n 5
+    sudo `basename $0` -n 5
 EOF
 }
 
diff --git a/deploy/daisy.conf b/deploy/daisy.conf
index f8ce0534..d9659dbb 100644
--- a/deploy/daisy.conf
+++ b/deploy/daisy.conf
@@ -32,3 +32,8 @@ client_ip_begin=99.99.1.50
 
 #The end value of PXE client ip range
 client_ip_end=99.99.1.150
+
+[multicast]
+#enabled multicast or not.
+daisy_conf_mcast_enabled=False
+
diff --git a/templates/physical_environment/vms/daisy.xml b/templates/physical_environment/vms/daisy.xml
index 574669bf..552addb5 100644
--- a/templates/physical_environment/vms/daisy.xml
+++ b/templates/physical_environment/vms/daisy.xml
@@ -15,9 +15,7 @@
     <acpi/>
     <apic/>
   </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>IvyBridge</model>
-  </cpu>
+  <cpu mode="host-model"/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/templates/virtual_environment/vms/all_in_one.xml b/templates/virtual_environment/vms/all_in_one.xml
index 75caed25..4d08a68b 100644
--- a/templates/virtual_environment/vms/all_in_one.xml
+++ b/templates/virtual_environment/vms/all_in_one.xml
@@ -15,9 +15,7 @@
     <acpi/>
     <apic/>
   </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>IvyBridge</model>
-  </cpu>
+  <cpu mode="host-model"/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/templates/virtual_environment/vms/computer01.xml b/templates/virtual_environment/vms/computer01.xml
index 323f741d..00d27182 100644
--- a/templates/virtual_environment/vms/computer01.xml
+++ b/templates/virtual_environment/vms/computer01.xml
@@ -15,9 +15,7 @@
     <acpi/>
     <apic/>
   </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>IvyBridge</model>
-  </cpu>
+  <cpu mode="host-model"/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/templates/virtual_environment/vms/computer02.xml b/templates/virtual_environment/vms/computer02.xml
index b8a4eac2..b2b48bf0 100644
--- a/templates/virtual_environment/vms/computer02.xml
+++ b/templates/virtual_environment/vms/computer02.xml
@@ -15,9 +15,7 @@
     <acpi/>
     <apic/>
   </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>IvyBridge</model>
-  </cpu>
+  <cpu mode="host-model"/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/templates/virtual_environment/vms/controller01.xml b/templates/virtual_environment/vms/controller01.xml
index b29b45c0..fbf14f16 100644
--- a/templates/virtual_environment/vms/controller01.xml
+++ b/templates/virtual_environment/vms/controller01.xml
@@ -15,9 +15,7 @@
     <acpi/>
     <apic/>
   </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>IvyBridge</model>
-  </cpu>
+  <cpu mode="host-model"/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/templates/virtual_environment/vms/controller02.xml b/templates/virtual_environment/vms/controller02.xml
index b49b9543..931c1f28 100644
--- a/templates/virtual_environment/vms/controller02.xml
+++ b/templates/virtual_environment/vms/controller02.xml
@@ -15,9 +15,7 @@
     <acpi/>
     <apic/>
   </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>IvyBridge</model>
-  </cpu>
+  <cpu mode="host-model"/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/templates/virtual_environment/vms/controller03.xml b/templates/virtual_environment/vms/controller03.xml
index f35f7ef8..8f1c0f02 100644
--- a/templates/virtual_environment/vms/controller03.xml
+++ b/templates/virtual_environment/vms/controller03.xml
@@ -15,9 +15,7 @@
     <acpi/>
     <apic/>
   </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>IvyBridge</model>
-  </cpu>
+  <cpu mode="host-model"/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
diff --git a/templates/virtual_environment/vms/daisy.xml b/templates/virtual_environment/vms/daisy.xml
index c95219b8..98703c7a 100644
--- a/templates/virtual_environment/vms/daisy.xml
+++ b/templates/virtual_environment/vms/daisy.xml
@@ -14,9 +14,7 @@
     <acpi/>
     <apic/>
   </features>
-  <cpu mode='custom' match='exact'>
-    <model fallback='allow'>IvyBridge</model>
-  </cpu>
+  <cpu mode="host-model"/>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>
-- 
2.16.6