diff options
author | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-10-03 16:54:43 +0200 |
---|---|---|
committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-10-03 16:54:43 +0200 |
commit | 11dbe27afb96c5b54b9f4f0a1c8b21194f59dc7b (patch) | |
tree | 1ee6814c36c7af010cff9d67a1cf1643b233a378 /fuel/prototypes/auto-deploy/examples/libvirt/conf/vms | |
parent | 0d4a1f4143d71fc616f456a3708d5c8c2a24ec3f (diff) |
Moving tag arno.2015.1.0 from genesis to fuel/stable/arnoarno.2015.1.0
Change-Id: I8bb3e28a814e04ad15e8a4b24b40bd7685600f46
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'fuel/prototypes/auto-deploy/examples/libvirt/conf/vms')
4 files changed, 1 insertions, 3 deletions
diff --git a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4 b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4 index ad5d4d1c8..099c21e68 100644 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4 +++ b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute4 @@ -9,7 +9,6 @@ <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 39059066c..76569e0ca 100644 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute5 +++ b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/compute5 @@ -8,7 +8,6 @@ <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 ca1bd3b05..715d4c4b4 100644 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller1 +++ b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/controller1 @@ -8,7 +8,6 @@ <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 d2a78411c..9ff801706 100644 --- a/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master +++ b/fuel/prototypes/auto-deploy/examples/libvirt/conf/vms/fuel-master @@ -98,5 +98,6 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/> </memballoon> </devices> + <seclabel type='dynamic' model='apparmor' relabel='yes'/> </domain> |