summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2015-07-01 19:34:51 +0200
committerJonas Bjurel <jonas.bjurel@ericsson.com>2015-07-01 20:14:25 +0200
commited3731988cdc90066aa4c8e6147f1acbc6622df8 (patch)
tree61d104e76b879176e130407c5ace2bd46b5443df
parentbf5b9331cd860d0622d4eeab3093e8dced15188e (diff)
Added libvirt boot watchdog definition to provide more robust deployment in case of dhcp/pxe time-out
Change-Id: Id505a0ee89b72460bc65c7181ceae40e5443a515 JIRA: Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
-rw-r--r--fuel/deploy/libvirt/vms/compute.xml1
-rw-r--r--fuel/deploy/libvirt/vms/controller.xml1
-rw-r--r--fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute41
-rw-r--r--fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute51
-rw-r--r--fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller11
5 files changed, 5 insertions, 0 deletions
diff --git a/fuel/deploy/libvirt/vms/compute.xml b/fuel/deploy/libvirt/vms/compute.xml
index 2ea35ac..86a7613 100644
--- 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
--- 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
--- 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
--- 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
--- 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/>