diff options
| author |   zhouya <zhou.ya@zte.com.cn> | 2017-04-25 14:42:01 +0800 |
|---|---|---|
| committer | zhouya <zhou.ya@zte.com.cn> | 2017-04-25 16:07:16 +0800 |
| commit | 9c6ca57f518ded774b830e4051e630d8cad1d4eb (patch) | |
| tree | 642f624bbf753764867a93965a81ecd3aeaae947 /templates | |
| parent | 3265b49f45d31d0e83e25aa61c0c22a19b44c4bf (diff) | |
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>
Diffstat (limited to 'templates')
8 files changed, 8 insertions, 24 deletions
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'/> |