diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-01 13:18:11 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-10-09 16:33:43 +0200 |
commit | 42f8585ebb8fffad19a89314659ab9129176c3e9 (patch) | |
tree | e2cf6a4797bcbd036e080541cc3925f8b209549b /patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.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/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch')
-rw-r--r-- | patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch | 138 |
1 files changed, 0 insertions, 138 deletions
diff --git a/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch b/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch deleted file mode 100644 index 417727ec..00000000 --- a/patches/fuel-library/0004-Make-TestVM-creation-architecture-aware.patch +++ /dev/null @@ -1,138 +0,0 @@ -From ec3299c72eae195106092a646409564b5b3eb560 Mon Sep 17 00:00:00 2001 -From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com> -Date: Wed, 24 Feb 2016 20:08:24 +0100 -Subject: [PATCH 10/20] Make TestVM creation architecture aware - -This depends on cirros-testvm package to contain both amd64 and arm64 -images. ---- - deployment/puppet/openstack/manifests/img/cirros.pp | 8 ++++++-- - .../osnailyfacter/manifests/generate_vms/vm_config.pp | 11 +++++++++++ - deployment/puppet/osnailyfacter/templates/vm_libvirt.erb | 15 ++++++++++++++- - files/fuel-migrate/fuel-migrate | 5 ++++- - 4 files changed, 35 insertions(+), 4 deletions(-) - -diff --git a/deployment/puppet/openstack/manifests/img/cirros.pp b/deployment/puppet/openstack/manifests/img/cirros.pp -index 84e202e..cff06e0 100644 ---- a/deployment/puppet/openstack/manifests/img/cirros.pp -+++ b/deployment/puppet/openstack/manifests/img/cirros.pp -@@ -9,6 +9,10 @@ class openstack::img::cirros ( - $img_name = 'cirros', - $os_name = 'cirros', - ) { -+ $arch = $::architecture ? { -+ /(arm64|aarch64)/ => 'aarch64', -+ default => 'x86_64', -+ } - - package { 'cirros-testvm': - ensure => "present" -@@ -17,14 +21,14 @@ class openstack::img::cirros ( - case $::osfamily { - 'RedHat': { - exec { 'upload-img': -- command => "/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} add name=${img_name} is_public=${public} container_format=${container_format} disk_format=${disk_format} distro=${os_name} < /opt/vm/cirros-x86_64-disk.img", -+ command => "/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} add name=${img_name} is_public=${public} container_format=${container_format} disk_format=${disk_format} distro=${os_name} < /opt/vm/cirros-${arch}-disk.img", - unless => "/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} index && (/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} index | grep ${img_name})", - - } - } - 'Debian': { - exec { 'upload-img': -- command => "/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} add name=${img_name} is_public=${public} container_format=${container_format} disk_format=${disk_format} distro=${os_name} < /usr/share/cirros-testvm/cirros-x86_64-disk.img", -+ command => "/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} add name=${img_name} is_public=${public} container_format=${container_format} disk_format=${disk_format} distro=${os_name} < /usr/share/cirros-testvm/cirros-${arch}-disk.img", - unless => "/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} index && (/usr/bin/glance -N ${os_auth_url} -T ${os_tenant_name} -I ${os_username} -K ${os_password} index | grep ${img_name})", - - } -diff --git a/deployment/puppet/osnailyfacter/manifests/generate_vms/vm_config.pp b/deployment/puppet/osnailyfacter/manifests/generate_vms/vm_config.pp -index 70fef32..dfefcbe 100644 ---- a/deployment/puppet/osnailyfacter/manifests/generate_vms/vm_config.pp -+++ b/deployment/puppet/osnailyfacter/manifests/generate_vms/vm_config.pp -@@ -4,6 +4,17 @@ define osnailyfacter::generate_vms::vm_config( - $details = $name - $id = $details['id'] - -+ case $::architecture { -+ 'arm64', 'aarch64': { -+ $machine_arch = 'aarch64' -+ $machine_type = 'virt' -+ } -+ default: { -+ $machine_arch = 'x86_64' -+ $machine_type = 'pc-i440fx-trusty' -+ } -+ } -+ - file { "${template_dir}/template_${id}_vm.xml": - owner => 'root', - group => 'root', -diff --git a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb -index ae2ba5b..64e716d 100644 ---- a/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb -+++ b/deployment/puppet/osnailyfacter/templates/vm_libvirt.erb -@@ -3,14 +3,23 @@ - <memory unit='GiB'><%= @details['mem'] %></memory> - <vcpu placement='static'><%= @details['cpu'] %></vcpu> - <os> -- <type arch='x86_64' machine='pc-i440fx-trusty'>hvm</type> -+ <type arch='<%= @machine_arch %>' machine='<%= @machine_type %>'>hvm</type> -+ <% if == 'aarch64' %> -+ <kernel>/var/lib/nova/<%= @details['id'] %>_vm.kernel</kernel> -+ <initrd>/var/lib/nova/<%= @details['id'] %>_vm.initramfs</initrd> -+ <cmdline>root=/dev/vda1 rw rootwait console=tty0 console=ttyS0 console=ttyAMA0</cmdline> -+ <% else %> - <boot dev='network'/> - <boot dev='hd'/> -+ <% end %> - </os> - <features> - <acpi/> - <apic/> - <pae/> -+ <% if $machine_arch == 'aarch64' %> -+ <gic version='host' /> -+ <% end %> - </features> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> -@@ -57,7 +66,11 @@ - <input type='keyboard' bus='ps2'/> - <graphics type='vnc' port='-1' autoport='yes'/> - <video> -+<% if $machine_arch == 'aarch64' %> -+ <model type='vga' vram='9216' heads='1'/> -+<% else %> - <model type='cirrus' vram='9216' heads='1'/> -+<% end %> - </video> - <memballoon model='virtio'> - </memballoon> -diff --git a/files/fuel-migrate/fuel-migrate b/files/fuel-migrate/fuel-migrate -index a215e0a..7d5b6cd 100755 ---- a/files/fuel-migrate/fuel-migrate -+++ b/files/fuel-migrate/fuel-migrate -@@ -176,6 +176,8 @@ create_vm(){ - exit 1 - fi - fi -+ # figure out atchitecture of the destination -+ arch="$(virsh -c "${dkvm_uri}" nodeinfo | awk '/CPU model:/ { print $3}')" - # create disk - ssh "${dkvm_ip}" qemu-img create -f raw "${dkvm_folder}/${fvm_name}.img" "${fvm_disk_size}" - # make template for virsh -@@ -185,13 +187,14 @@ create_vm(){ - <memory unit='MiB'>${fvm_ram}</memory> - <vcpu >${fvm_cpu}</vcpu> - <os> -- <type arch='x86_64' >hvm</type> -+ <type arch='${arch}' >hvm</type> - <boot dev='hd'/> - <boot dev='network'/> - </os> - <features> - <acpi/> - <apic/> -+ ${arch/aarch64/<gic version='3'\/>} - </features> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> |