From: Jonas Bjurel <jonas.bjurel@ericsson.com>
Date: Wed, 1 Jul 2015 17:34:51 +0000 (+0200)
Subject: Added libvirt boot watchdog definition to provide more robust deployment in case... 
X-Git-Tag: arno.2015.2.0~64
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=genesis.git;a=commitdiff_plain;h=6d190f937d095a71578550bc3bb4a70f0905e594

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>
(cherry picked from commit ed3731988cdc90066aa4c8e6147f1acbc6622df8)
---

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/>