diff options
author | Josep Puigdemont <josep.puigdemont@enea.com> | 2016-05-08 13:04:07 +0200 |
---|---|---|
committer | Josep Puigdemont <josep.puigdemont@gmail.com> | 2016-05-08 12:18:25 +0000 |
commit | bedeb36ac9ad42fb1ead2449ed8e75f0171808a2 (patch) | |
tree | d09bf3d730b109339363c326dc96dfd187b037f9 /patches/opnfv-fuel/0025-Fuel-VM-for-the-Enea-Armband-lab.patch | |
parent | 82b3b366f2c677ea0ad58555d630f4c4091f82a3 (diff) |
ARMband patches for the fuel@opnfv deploy scripts
These are a collection of patches that adapt the current Fuel deploy
scripts for mainly two purposes:
- Make it possible to create a Fuel VM on a remote libvirt server.
We use the LIBVIRT_DEFAULT_URI environment variable to detect that.
Local deploys are possible by setting this variable to
'quemu:///system', or leaving it empty.
See: https://libvirt.org/remote.html for more details.
- Make it possible to add additional network interfaces. For this we
allow the user to pass the "-b bridge" paramter several times, and
creating a new virtual NIC for each of them, in the same order they
were given.
This required a bit of refactoring of the code.
None of the changes above should break backwards compatibility, except
when indicated in the commit (search for CHANGE in the log)
In addition there are some updates to the code that were deemed
necessary, like the ability to retry when executing shell commands
instead of directly failing, and a simplification of the DHA IPMI
adapter.
Change-Id: I8a0cd5b8672383decd861309328137971eaed14b
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0025-Fuel-VM-for-the-Enea-Armband-lab.patch')
-rw-r--r-- | patches/opnfv-fuel/0025-Fuel-VM-for-the-Enea-Armband-lab.patch | 106 |
1 files changed, 106 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0025-Fuel-VM-for-the-Enea-Armband-lab.patch b/patches/opnfv-fuel/0025-Fuel-VM-for-the-Enea-Armband-lab.patch new file mode 100644 index 00000000..fbcd11d1 --- /dev/null +++ b/patches/opnfv-fuel/0025-Fuel-VM-for-the-Enea-Armband-lab.patch @@ -0,0 +1,106 @@ +From: Josep Puigdemont <josep.puigdemont@enea.com> +Date: Wed, 4 May 2016 14:27:23 +0200 +Subject: [PATCH] Fuel VM for the Enea Armband lab + +This is the initial VM description fit for Enea's Armband lab. + +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> +--- + .../hardware_environment/vms/enea_lab/fuel.xml | 88 ++++++++++++++++++++++ + 1 file changed, 88 insertions(+) + create mode 100644 deploy/templates/hardware_environment/vms/enea_lab/fuel.xml + +diff --git a/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml b/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml +new file mode 100644 +index 0000000..8773ed4 +--- /dev/null ++++ b/deploy/templates/hardware_environment/vms/enea_lab/fuel.xml +@@ -0,0 +1,88 @@ ++<domain type='kvm' id='1'> ++ <name>fuel</name> ++ <memory unit='KiB'>8290304</memory> ++ <currentMemory unit='KiB'>8290304</currentMemory> ++ <vcpu placement='static'>8</vcpu> ++ <resource> ++ <partition>/machine</partition> ++ </resource> ++ <os> ++ <type arch='x86_64' machine='pc-i440fx-rhel7.0.0'>hvm</type> ++ <boot dev='cdrom'/> ++ <boot dev='hd'/> ++ <bootmenu enable='no'/> ++ </os> ++ <features> ++ <acpi/> ++ <apic/> ++ <pae/> ++ </features> ++ <cpu mode='host-model'> ++ <model fallback='allow'/> ++ </cpu> ++ <clock offset='utc'> ++ <timer name='rtc' tickpolicy='catchup'/> ++ <timer name='pit' tickpolicy='delay'/> ++ <timer name='hpet' present='no'/> ++ </clock> ++ <on_poweroff>destroy</on_poweroff> ++ <on_reboot>restart</on_reboot> ++ <on_crash>restart</on_crash> ++ <pm> ++ <suspend-to-mem enabled='no'/> ++ <suspend-to-disk enabled='no'/> ++ </pm> ++ <devices> ++ <emulator>/usr/libexec/qemu-kvm</emulator> ++ <disk type='file' device='disk'> ++ <driver name='qemu' type='qcow2'/> ++ <target dev='vda' bus='virtio'/> ++ </disk> ++ <disk type='block' device='cdrom'> ++ <driver name='qemu' type='raw'/> ++ <target dev='hdb' bus='ide'/> ++ <readonly/> ++ </disk> ++ <controller type='usb' index='0' model='ich9-ehci1'> ++ </controller> ++ <controller type='usb' index='0' model='ich9-uhci1'> ++ <master startport='0'/> ++ </controller> ++ <controller type='usb' index='0' model='ich9-uhci2'> ++ <master startport='2'/> ++ </controller> ++ <controller type='usb' index='0' model='ich9-uhci3'> ++ <master startport='4'/> ++ </controller> ++ <controller type='pci' index='0' model='pci-root'> ++ </controller> ++ <controller type='ide' index='0'> ++ </controller> ++ <controller type='virtio-serial' index='0'> ++ </controller> ++ <interface type='bridge'> ++ <model type='virtio'/> ++ </interface> ++ <interface type='bridge'> ++ <model type='virtio'/> ++ </interface> ++ <serial type='pty'> ++ <source path='/dev/pts/0'/> ++ <target port='0'/> ++ </serial> ++ <console type='pty' tty='/dev/pts/0'> ++ <source path='/dev/pts/0'/> ++ <target type='serial' port='0'/> ++ </console> ++ <input type='mouse' bus='ps2'/> ++ <input type='keyboard' bus='ps2'/> ++ <graphics type='vnc' port='5906' autoport='yes' listen='127.0.0.1'> ++ <listen type='address' address='127.0.0.1'/> ++ </graphics> ++ <video> ++ <model type='vga' vram='16384' heads='1'/> ++ </video> ++ <memballoon model='virtio'> ++ </memballoon> ++ </devices> ++</domain> |