diff options
author | 2016-10-01 13:18:11 +0200 | |
---|---|---|
committer | 2016-10-09 16:33:43 +0200 | |
commit | 42f8585ebb8fffad19a89314659ab9129176c3e9 (patch) | |
tree | e2cf6a4797bcbd036e080541cc3925f8b209549b /patches/opnfv-fuel/0002-Fuel-VM-for-the-Enea-Armband-lab.patch | |
parent | 6f3a054fc95622f0c002f72c0fac6074bb36c36f (diff) |
build: Rework patch mechanism for Fuel submodules
While refactoring the patching mechanism, take care of:
- Sync submodule handling with Fuel@OPFNV;
- build: Investigate/prepare for moving patches to Fuel@OPNFV;
- build: Investigate divergent fuel-mirror;
- ISO build: cacheid for Fuel comps should not depend on
Armband git commit;
CHANGE:
Rename/shuffle patches while grouping them in "features",
preparing for upstreaming them to Fuel@OPNFV and beyond.
CHANGE:
Allow linking patches for better representing the dependency
between one patch and different features.
e.g. 0001-Add-arch-to-nailgun-release-and-target-image.patch:
- part of `multiarch-fuel`, because it extends Fuel;
- part of `direct-kernel-boot`, as arch is required for that;
- part of `cross-bootstrap`, target image is arch-dependent;
NOTE: Patch links are not staged to Fuel@OPNFV, they only serve
as markers that a specific patch is part of a feature.
CHANGE:
Kill all Fuel component submodules, now handled in Fuel@OPNFV:
- fuel-agent
- fuel-astute
- fuel-library
- fuel-mirror
- fuel-nailgun-agent
- fuel-web
CHANGE:
Move armband-fuel-config.mk to armband git root.
FIXME: m1.micro-Increase-profile-RAM-size-to-128MB.patch is NOT
part of `cross-bootstrap` feature, but patch context says so ...
FIXME: 0001-Add-arm64-deb-repositories-setup.patch is broken at
`make patches-export` by removing spaces at EOL.
v2 -> v3:
* Phony patch support (links to show a patch belongs to a feature);
* Updated README.md
v3 -> v7:
* Re-export Fuel submodules & plugins patches (update patch context);
* Update Cavium mail addresses (s/caviumnetworks.com/cavium.com/);
* Ignore submodule changes;
* Add armband git repo info to gitinfo_fuel.txt at build time;
Implements: ARMBAND-136
Closes-bug: ARMBAND-95
Closes-bug: ARMBAND-93
Closes-bug: ARMBAND-92
Change-Id: I1a236d9f43b2e6dca22055911f696b43c22b5973
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0002-Fuel-VM-for-the-Enea-Armband-lab.patch')
-rw-r--r-- | patches/opnfv-fuel/0002-Fuel-VM-for-the-Enea-Armband-lab.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0002-Fuel-VM-for-the-Enea-Armband-lab.patch b/patches/opnfv-fuel/0002-Fuel-VM-for-the-Enea-Armband-lab.patch new file mode 100644 index 00000000..cefc0625 --- /dev/null +++ b/patches/opnfv-fuel/0002-Fuel-VM-for-the-Enea-Armband-lab.patch @@ -0,0 +1,107 @@ +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. + +Change-Id: Ia89f9728fff0ab1c279f6200fd558d9643cf4ea5 +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' cache='writeback'/> ++ <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> |