From 543130927ba40a174e8674cca66ae442d5056d76 Mon Sep 17 00:00:00 2001
From: Jonas Bjurel <jonas.bjurel@ericsson.com>
Date: Sat, 3 Oct 2015 17:34:24 +0200
Subject: Moving tag arno.2015.2.0 from genesis to fuel/stable/arno

Change-Id: I01b5f9f9125756d80d7ca666bb6d994f2b13d2a0
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
---
 fuel/prototypes/auto-deploy/configs/lf_pod1/dea_ha.yaml           | 2 +-
 fuel/prototypes/auto-deploy/configs/lf_pod1/dea_no-ha.yaml        | 2 +-
 fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4    | 1 +
 fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute5    | 1 +
 fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller1 | 1 +
 fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master | 1 -
 6 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'fuel/prototypes/auto-deploy')

diff --git a/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_ha.yaml b/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_ha.yaml
index 9e7042732..25de4b98e 100644
--- a/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_ha.yaml
+++ b/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_ha.yaml
@@ -205,7 +205,7 @@ network:
     gateway: 172.30.9.1
     ip_ranges:
     - - 172.30.9.70
-      - 172.30.9.70
+      - 172.30.9.79
     meta:
       assign_vip: true
       cidr: 172.16.0.0/24
diff --git a/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_no-ha.yaml b/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_no-ha.yaml
index fd0e7b3e8..3abbdce93 100644
--- a/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_no-ha.yaml
+++ b/fuel/prototypes/auto-deploy/configs/lf_pod1/dea_no-ha.yaml
@@ -205,7 +205,7 @@ network:
     gateway: 172.30.9.1
     ip_ranges:
     - - 172.30.9.70
-      - 172.30.9.70
+      - 172.30.9.79
     meta:
       assign_vip: true
       cidr: 172.16.0.0/24
diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4
index 099c21e68..ad5d4d1c8 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 76569e0ca..39059066c 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 715d4c4b4..ca1bd3b05 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/>
diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master
index 9ff801706..d2a78411c 100644
--- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master
+++ b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master
@@ -98,6 +98,5 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
     </memballoon>
   </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
 </domain>
 
-- 
cgit 1.2.3-korg