Merge "Fixes networking related constraints for Virtual deployments"

diff --git a/fuel/deploy/libvirt/vms/compute.xml b/fuel/deploy/libvirt/vms/compute.xml
index 2ea35ac..86a7613 100644 (file)
--- a/fuel/deploy/libvirt/vms/compute.xml
+++ b/fuel/deploy/libvirt/vms/compute.xml
@@ -8,6 +8,7 @@
     <boot dev='network'/>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
+    <bios rebootTimeout='30000'/>
   </os>
   <features>
     <acpi/>

diff --git a/fuel/deploy/libvirt/vms/controller.xml b/fuel/deploy/libvirt/vms/controller.xml
index 4377879..9e49b0f 100644 (file)
--- a/fuel/deploy/libvirt/vms/controller.xml
+++ b/fuel/deploy/libvirt/vms/controller.xml
@@ -7,6 +7,7 @@
     <type arch='x86_64' machine='pc-1.0'>hvm</type>
     <boot dev='network'/>
     <boot dev='hd'/>
+    <bios rebootTimeout='30000'/>
   </os>
   <features>
     <acpi/>

diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4
index 099c21e..ad5d4d1 100644 (file)
--- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4
+++ b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4
@@ -9,6 +9,7 @@
     <boot dev='network'/>
     <boot dev='hd'/>
     <bootmenu enable='yes'/>
+    <bios rebootTimeout='30000'/>
   </os>
   <features>
     <acpi/>

diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute5 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute5
index 76569e0..3905906 100644 (file)
--- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute5
+++ b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute5
@@ -8,6 +8,7 @@
     <type arch='x86_64' machine='pc-1.0'>hvm</type>
     <boot dev='network'/>
     <boot dev='hd'/>
+    <bios rebootTimeout='30000'/>
   </os>
   <features>
     <acpi/>

diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller1 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller1
index 715d4c4..ca1bd3b 100644 (file)
--- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller1
+++ b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller1
@@ -8,6 +8,7 @@
     <type arch='x86_64' machine='pc-1.0'>hvm</type>
     <boot dev='network'/>
     <boot dev='hd'/>
+    <bios rebootTimeout='30000'/>
   </os>
   <features>
     <acpi/>