diff options
Diffstat (limited to 'patches')
18 files changed, 219 insertions, 874 deletions
diff --git a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch index 85751ce2..58028197 100644 --- a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch +++ b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch @@ -10,40 +10,41 @@ From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Date: Sun, 26 Nov 2017 17:25:08 +0100 Subject: [PATCH] baremetal: Add Armband Openstack repos to kvm, cmp -Armband provides 2 sets of APT repositories: -- linux.system.repo.mcp.armband.openstack; -- linux.system.repo.mcp.armband.extra (currently empty); +Armband provides one APT repository that should be added to all +baremetal nodes explicitly (the other Armband repos are now part of +`linux.system.repo.mcp.openstack` or `linux.system.repo.mcp.extra`): +- linux.system.repo.mcp.armband; -These repos are pre-installed for all infrastructure VMs, so we only -handle them via Salt for baremetal kvm* and cmp* nodes. +This repo is pre-installed for all infrastructure VMs, so we only +handle it via Salt for baremetal kvm* and cmp* nodes. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml | 1 + - .../classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml | 1 + + mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml | 1 + + .../classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml | 1 + 2 files changed, 2 insertions(+) -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml -index ce7fc85..6491798 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml +diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml +index fe96465..37805ca 100644 +--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml ++++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml @@ -7,6 +7,7 @@ ############################################################################## --- classes: -+ - system.linux.system.repo.mcp.armband.openstack - - system.linux.system.repo.mcp.openstack - - system.linux.system.repo.mcp.extra - - system.linux.system.repo.glusterfs -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml -index e07e611..278e55b 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml ++ - system.linux.system.repo.mcp.armband + - service.keepalived.cluster.single + - system.glusterfs.server.volume.glance + - system.glusterfs.server.volume.keystone +diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml +index 6324044..ac56a12 100644 +--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml ++++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml @@ -7,6 +7,7 @@ ############################################################################## --- classes: -+ - system.linux.system.repo.mcp.armband.openstack - - system.linux.system.repo.mcp.extra - - system.linux.system.repo.glusterfs ++ - system.linux.system.repo.mcp.armband - system.linux.storage.loopback + - system.glusterfs.client.cluster + - system.nova.compute.cluster diff --git a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch index 279a802d..68c03080 100644 --- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch @@ -28,16 +28,16 @@ Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - mcp/config/states/openstack | 2 + mcp/config/states/openstack_ha | 1 + + mcp/config/states/openstack_noha | 2 + mcp/config/states/virtual_control_plane | 1 + - .../armband/files/nova-libvirt-aarch64-rollup.diff | 317 +++++++++++++++++++++ + .../armband/files/nova-libvirt-aarch64-rollup.diff | 270 +++++++++++++++++++++ mcp/salt-formulas/armband/init.sls | 7 + - mcp/salt-formulas/armband/nova_config.sls | 30 ++ + mcp/salt-formulas/armband/nova_config.sls | 30 +++ mcp/salt-formulas/armband/nova_libvirt.sls | 7 + mcp/salt-formulas/armband/qemu_efi.sls | 2 + mcp/salt-formulas/armband/vgabios.sls | 7 + - 9 files changed, 374 insertions(+) + 9 files changed, 327 insertions(+) create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff create mode 100644 mcp/salt-formulas/armband/init.sls create mode 100644 mcp/salt-formulas/armband/nova_config.sls @@ -45,46 +45,46 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> create mode 100644 mcp/salt-formulas/armband/qemu_efi.sls create mode 100644 mcp/salt-formulas/armband/vgabios.sls -diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack -index 369e165..d2a0b63 100755 ---- a/mcp/config/states/openstack -+++ b/mcp/config/states/openstack -@@ -47,3 +47,5 @@ salt -I 'ceilometer:server' state.sls ceilometer - salt -I 'ceilometer:agent' state.sls ceilometer - - salt -I 'horizon:server' state.sls horizon -+ -+salt -I 'nova:compute' state.sls armband || true diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index 1bd1a9d..f51e301 100755 +index 62a9654..bf17e20 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha -@@ -53,6 +53,7 @@ salt -I 'neutron:gateway' state.sls neutron.gateway - salt -I 'neutron:gateway' service.restart networking +@@ -52,6 +52,7 @@ salt -I 'neutron:server' state.sls neutron -b 1 + salt -I 'neutron:gateway' state.sls neutron.gateway salt -I 'nova:compute' state.sls nova +salt -I 'nova:compute' state.sls armband || true salt -I 'mongodb:server' state.sls mongodb || true wait_for 90 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'" +diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha +index 1578dcf..6dc27cd 100755 +--- a/mcp/config/states/openstack_noha ++++ b/mcp/config/states/openstack_noha +@@ -49,3 +49,5 @@ salt -I 'ceilometer:server' state.sls ceilometer + salt -I 'ceilometer:agent' state.sls ceilometer + + salt -I 'horizon:server' state.sls horizon ++ ++salt -I 'nova:compute' state.sls armband || true diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index b08a31c..5b519be 100755 +index d92e992..1cfcacd 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane -@@ -46,6 +46,7 @@ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ - - salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp - +@@ -29,6 +29,7 @@ fi + # KVM libvirt first, VCP deployment + #FIXME Should be removed once upstream patch get merged + salt -C 'kvm*' group.add libvirtd +salt -C 'kvm*' state.sls armband || true wait_for 5 "salt -C 'kvm*' state.sls libvirt" - salt -C '* and not cfg01* and not mas01*' state.apply salt + salt -C 'kvm* or cmp*' state.apply salt diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff new file mode 100644 -index 0000000..4d7f04c +index 0000000..75fb07d --- /dev/null +++ b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff -@@ -0,0 +1,317 @@ +@@ -0,0 +1,270 @@ +From 807579755c4a116309eca5b2bcdbab9d1f393bab Mon Sep 17 00:00:00 2001 +From: Matt Riedemann <mriedem.os@gmail.com> +Date: Wed, 20 Sep 2017 10:44:11 -0400 @@ -125,7 +125,7 @@ index 0000000..4d7f04c +index f0e6953b965..9b9ea9507e8 100644 +--- a/nova/test.py ++++ b/nova/test.py -+@@ -61,6 +61,7 @@ ++@@ -60,6 +60,7 @@ + from nova.tests.unit import policy_fixture + from nova.tests import uuidsentinel as uuids + from nova import utils @@ -133,20 +133,20 @@ index 0000000..4d7f04c + + + CONF = cfg.CONF -+@@ -303,6 +304,8 @@ def setUp(self): ++@@ -299,6 +300,8 @@ def setUp(self): + # nova.utils._IS_NEUTRON. We set it to None to avoid any + # caching of that value. + utils._IS_NEUTRON = None ++ # Reset the global QEMU version flag. ++ images.QEMU_VERSION = None + -+ mox_fixture = self.useFixture(moxstubout.MoxStubout()) -+ self.mox = mox_fixture.mox ++ # Reset the traits sync flag ++ objects.resource_provider._TRAITS_SYNCED = False +diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py +index fe54dc75e7f..4e9f2bd250e 100644 +--- a/nova/tests/unit/virt/libvirt/test_driver.py ++++ b/nova/tests/unit/virt/libvirt/test_driver.py -+@@ -986,6 +986,23 @@ def test_next_min_qemu_version_ok(self, mock_warning, mock_get_libversion): ++@@ -985,6 +985,23 @@ def test_next_min_qemu_version_ok(self, mock_warning, mock_get_libversion): + break + self.assertFalse(version_arg_found) + @@ -170,7 +170,7 @@ index 0000000..4d7f04c + @mock.patch.object(fakelibvirt.Connection, 'getLibVersion', + return_value=versionutils.convert_version_to_int( + libvirt_driver.MIN_LIBVIRT_OTHER_ARCH.get( -+@@ -11605,9 +11622,8 @@ def test_command_with_broken_connection(self): ++@@ -11636,9 +11653,8 @@ def test_command_with_broken_connection(self): + return_value=service_mock), + mock.patch.object(host.Host, "get_capabilities")): + @@ -230,7 +230,7 @@ index 0000000..4d7f04c + + from oslo_concurrency import processutils +@@ -42,6 +43,11 @@ -+ cpu_time=8, ++ cpu_time=30, + address_space=1 * units.Gi) + ++# This is set by the libvirt driver on startup. The version is used to @@ -241,8 +241,8 @@ index 0000000..4d7f04c + + def qemu_img_info(path, format=None): + """Return an object containing the parsed output from qemu-img info.""" -+@@ -60,6 +66,10 @@ def qemu_img_info(path, format=None): -+ cmd = ('env', 'LC_ALL=C', 'LANG=C', 'qemu-img', 'info', path) ++@@ -61,6 +67,10 @@ def qemu_img_info(path, format=None): ++ 'qemu-img', 'info', '--force-share', path) + if format is not None: + cmd = cmd + ('-f', format) ++ # Check to see if the qemu version is >= 2.10 because if so, we need @@ -256,7 +256,7 @@ index 0000000..4d7f04c +index 82dc2b99f6a..8d4eb90ecf5 100644 +--- a/nova/virt/libvirt/driver.py ++++ b/nova/virt/libvirt/driver.py -+@@ -481,11 +481,15 @@ def init_host(self, host): ++@@ -477,11 +477,15 @@ def init_host(self, host): + _('Nova requires libvirt version %s or greater.') % + self._version_to_string(MIN_LIBVIRT_VERSION)) + @@ -279,38 +279,6 @@ index 0000000..4d7f04c + if not self._host.has_min_version(hv_ver=MIN_VIRTUOZZO_VERSION): +-- + -+From: Stanislaw Kardach <stanislaw.kardach@cavium.com> -+Date: Tue, 22 Mar 2016 12:05:09 +0100 -+Subject: [PATCH] nova: Update console defaults for armv7, aarch64 -+ -+Nova hardcodes default options for serial console. -+For armv7 and aarch64 direct kernel boot, adding console=ttyAMA0 is -+a nice UX addition. -+ -+Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com> -+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -+Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> -+ -+--- -+ -+diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py -+--- a/nova/virt/libvirt/driver.py -++++ b/nova/virt/libvirt/driver.py -+@@ -4179,7 +4179,12 @@ class LibvirtDriver(driver.ComputeDriver): -+ if virt_type == "xen": -+ guest.os_cmdline = "ro root=%s" % root_device_name -+ else: -++ guestarch = libvirt_utils.get_arch(image_meta) -+ guest.os_cmdline = ("root=%s %s" % (root_device_name, CONSOLE)) -++ if guestarch in (fields.Architecture.ARMV7, -++ fields.Architecture.AARCH64): -++ # NOTE(armband): ARM v7/v8 use PL011 drv, add ttyAMA0 console -++ guest.os_cmdline += " console=ttyAMA0" -+ if virt_type == "qemu": -+ guest.os_cmdline += " no_timer_check" -+ if instance.ramdisk_id: -+-- -+ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Thu, 24 Aug 2017 10:57:28 +0200 +Subject: [PATCH] libvirt: AArch64: ACPI depends on AAVMF @@ -318,6 +286,9 @@ index 0000000..4d7f04c +On AArch64, ACPI should be added to domain XML only if guest UEFI +(AAVMF) is also used. + ++[ Alexandru.Avadanii@enea.com ] ++- pike rebase: minor context adj ++ +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Signed-off-by: Ciprian Barbu <ciprian.barbu@enea.com> + @@ -326,16 +297,7 @@ index 0000000..4d7f04c +diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py +--- a/nova/virt/libvirt/driver.py ++++ b/nova/virt/libvirt/driver.py -+@@ -4255,7 +4255,7 @@ -+ tmhyperv.present = True -+ clk.add_timer(tmhyperv) -+ -+- def _set_features(self, guest, os_type, caps, virt_type): -++ def _set_features(self, guest, os_type, image_meta, caps, virt_type): -+ if virt_type == "xen": -+ # PAE only makes sense in X86 -+ if caps.host.cpu.arch in (fields.Architecture.I686, -+@@ -4264,7 +4264,10 @@ ++@@ -4314,7 +4314,10 @@ + + if (virt_type not in ("lxc", "uml", "parallels", "xen") or + (virt_type == "xen" and guest.os_type == fields.VMMode.HVM)): @@ -347,15 +309,6 @@ index 0000000..4d7f04c + guest.features.append(vconfig.LibvirtConfigGuestFeatureAPIC()) + + if (virt_type in ("qemu", "kvm") and -+@@ -4799,7 +4802,7 @@ -+ self._conf_non_lxc_uml(virt_type, guest, root_device_name, rescue, -+ instance, inst_path, image_meta, disk_info) -+ -+- self._set_features(guest, instance.os_type, caps, virt_type) -++ self._set_features(guest, instance.os_type, image_meta, caps, virt_type) -+ self._set_clock(guest, instance.os_type, image_meta, virt_type) -+ -+ storage_configs = self._get_guest_storage_config( +-- + +From f0f09530ee9169eb29bc28d4f118676d7dc6640e Mon Sep 17 00:00:00 2001 diff --git a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch index 1dc8f99b..9b205181 100644 --- a/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch +++ b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch @@ -35,8 +35,8 @@ range for the public network to not include that address. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- mcp/config/states/networks | 6 +++--- - .../classes/cluster/virtual-mcp-ocata-common/infra/config.yml | 6 +++--- - .../classes/cluster/virtual-mcp-ocata-common/openstack_init.yml | 2 +- + .../classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml | 6 +++--- + .../classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml | 2 +- mcp/scripts/net_public.xml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) @@ -62,10 +62,10 @@ index d4735ad..e566903 100755 + openstack subnet create --gateway ${PUBLIC_NET%.*}.254 --no-dhcp \ + --allocation-pool start=${PUBLIC_NET%.*}.130,end=${PUBLIC_NET%.*}.200 \ --network floating_net --subnet-range ${PUBLIC_NET} floating_subnet" -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml index 3c3d526..e114ec2 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml +--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/infra/config.yml @@ -61,13 +61,13 @@ parameters: params: single_address: 172.16.10.105 @@ -83,10 +83,10 @@ index 3c3d526..e114ec2 100644 tenant_address: 10.1.0.110 - external_address: 10.16.0.110 + external_address: 10.0.9.110 -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml -index 81f050f..b304c28 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml +index cf35a2b..d677420 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml @@ -14,7 +14,7 @@ parameters: openstack_region: RegionOne admin_email: root@localhost diff --git a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch index 05ef0267..3881ef91 100644 --- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch +++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -16,7 +16,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- ...-Add-curtin_userdata_arm64_generic_xenial.patch | 35 ++++++++++++++++++ mcp/patches/patches.list | 1 + - .../baremetal-mcp-ocata-common/infra/maas.yml | 26 +++++++++++++ + .../baremetal-mcp-pike-common-ha/infra/maas.yml | 26 +++++++++++++ .../files/curtin_userdata_arm64_generic_xenial | 43 ++++++++++++++++++++++ 4 files changed, 105 insertions(+) create mode 100644 mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch @@ -64,18 +64,18 @@ index 0000000..0368937 + file.managed: + - source: salt://maas/files/pgpass diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index d0bb7c4..7c5bf15 100644 +index fcbd3ae..c303a96 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -17,3 +17,4 @@ +@@ -16,3 +16,4 @@ /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch +/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml -index e8c2965..b15f9cb 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/maas.yml +diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml +index 93db0ed..bffab44 100644 +--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml ++++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml @@ -110,6 +110,32 @@ parameters: architecture: ${_param:opnfv_maas_node05_architecture} distro_series: xenial diff --git a/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch deleted file mode 100644 index 3411aad9..00000000 --- a/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch +++ /dev/null @@ -1,58 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Sun, 20 Aug 2017 18:18:53 +0200 -Subject: [PATCH] libvirt: Use "libvirt" unix_sock_group - -On AArch64, libvirt 3.x is used, which uses "libvirt" by default, -so change old "libvirtd" in <libvirt/files/libvirtd.conf.Debian>. - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - ...libvirt-unix_sock_group-s-libvirtd-libvirt.patch | 21 +++++++++++++++++++++ - mcp/patches/patches.list | 1 + - 2 files changed, 22 insertions(+) - create mode 100644 mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch - -diff --git a/mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch b/mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch -new file mode 100644 -index 0000000..003b249 ---- /dev/null -+++ b/mcp/patches/0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch -@@ -0,0 +1,21 @@ -+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -+Date: Sun, 20 Aug 2017 02:03:01 +0200 -+Subject: [PATCH] libvirt: unix_sock_group: s/libvirtd/libvirt/ -+ -+On AArch64, libvirt 3.x is used, which uses "libvirt" by default. -+ -+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -+--- -+ -+diff --git a/libvirt/files/libvirtd.conf.Debian b/libvirt/files/libvirtd.conf.Debian -+--- a/libvirt/files/libvirtd.conf.Debian -++++ b/libvirt/files/libvirtd.conf.Debian -+@@ -81,7 +81,7 @@ -+ # without becoming root. -+ # -+ # This is restricted to 'root' by default. -+-unix_sock_group = "libvirtd" -++unix_sock_group = "libvirt" -+ -+ # Set the UNIX socket permissions for the R/O socket. This is used -+ # for monitoring VM status only -diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 7c5bf15..218ed51 100644 ---- a/mcp/patches/patches.list -+++ b/mcp/patches/patches.list -@@ -18,3 +18,4 @@ - /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch - /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch - /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch -+/usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch diff --git a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 34fe3c5d..0d9a9130 100644 --- a/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch @@ -33,18 +33,18 @@ to pick up the changes, so we'll run it before rebooting kvm nodes. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - mcp/config/states/virtual_control_plane | 1 + + mcp/config/states/baremetal_init | 1 + .../armband/files/salt-minion-aarch64-rollup.diff | 101 +++++++++++++++++++++ mcp/salt-formulas/armband/salt_minion.sls | 7 ++ 3 files changed, 109 insertions(+) create mode 100644 mcp/salt-formulas/armband/files/salt-minion-aarch64-rollup.diff create mode 100644 mcp/salt-formulas/armband/salt_minion.sls -diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index 5b519be..d8d2d02 100755 ---- a/mcp/config/states/virtual_control_plane -+++ b/mcp/config/states/virtual_control_plane -@@ -40,6 +40,7 @@ salt -C 'kvm*' pkg.install bridge-utils +diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init +index 7b532da..67022b0 100755 +--- a/mcp/config/states/baremetal_init ++++ b/mcp/config/states/baremetal_init +@@ -26,6 +26,7 @@ salt -C 'kvm*' pkg.install bridge-utils salt -C 'kvm*' state.apply linux.network salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true diff --git a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch index 8561b963..4976c1df 100644 --- a/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -26,8 +26,8 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> .../0103-virtng-module-Extend-libvirt_domain.patch | 54 ++++++++++++++++++++++ ...4-salt-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++++ mcp/patches/patches.list | 2 + - .../baremetal-mcp-ocata-common/infra/kvm.yml | 15 ++++++ - .../baremetal-mcp-ocata-odl-ha/infra/kvm.yml | 3 ++ + .../baremetal-mcp-pike-common-ha/infra/kvm.yml | 15 ++++++ + .../baremetal-mcp-pike-odl-ha/infra/kvm.yml | 3 ++ 5 files changed, 125 insertions(+) create mode 100644 mcp/patches/0103-virtng-module-Extend-libvirt_domain.patch create mode 100644 mcp/patches/0104-salt-control-virt-Extend-libvirt_domain.patch @@ -150,19 +150,19 @@ index 0000000..a9fe11b + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index 218ed51..2f12b7f 100644 +index c303a96..940ee4d 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -19,3 +19,5 @@ +@@ -17,3 +17,5 @@ + /usr/share/salt-formulas/reclass: 0011-service.horizon.server.cluster-Default-to-v2-API.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch - /usr/share/salt-formulas/env: 0102-libvirt-unix_sock_group-s-libvirtd-libvirt.patch +/usr/share/salt-formulas/env: 0103-virtng-module-Extend-libvirt_domain.patch +/usr/share/salt-formulas/env: 0104-salt-control-virt-Extend-libvirt_domain.patch -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml -index 6491798..bf58f74 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/infra/kvm.yml +diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml +index 37805ca..0dfe990 100644 +--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml ++++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/kvm.yml @@ -49,21 +49,33 @@ parameters: openstack.control: cpu: 4 @@ -207,10 +207,10 @@ index 6491798..bf58f74 100644 disk_profile: small net_profile: default_ext cluster: -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml -index d7bbadd..f8b9662 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml +diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml +index 6bcc72d..53a1ddd 100644 +--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml ++++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/infra/kvm.yml @@ -17,6 +17,9 @@ parameters: opendaylight.server: cpu: 4 diff --git a/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch index 86a57386..86a57386 100644 --- a/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch +++ b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch diff --git a/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch index ebf454f4..86a963cc 100644 --- a/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch +++ b/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch @@ -16,14 +16,14 @@ Those instructions need to be overwritten for ARM. Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com> --- - .../classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml | 4 ++-- + .../cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml -index 278e55b..ff57ad3 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute.yml -@@ -13,8 +13,8 @@ classes: +diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml +index ac56a12..9cd873a 100644 +--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml ++++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_compute.yml +@@ -11,8 +11,8 @@ classes: - system.linux.storage.loopback - system.glusterfs.client.cluster - system.nova.compute.cluster diff --git a/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch new file mode 100644 index 00000000..ad883961 --- /dev/null +++ b/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch @@ -0,0 +1,46 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2017 Enea AB and others. +: +: All rights reserved. This program and the accompanying materials +: are made available under the terms of the Apache License, Version 2.0 +: which accompanies this distribution, and is available at +: http://www.apache.org/licenses/LICENSE-2.0 +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Wed, 30 Aug 2017 22:15:07 +0200 +Subject: [PATCH] baremetal, virtual: Extend arch list for UCA repo + +JIRA: https://jira.opnfv.org/browse/ARMBAND-304 + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + .../classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml | 2 +- + .../classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml +index e2f6539..2a14c66 100644 +--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml ++++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_init.yml +@@ -199,7 +199,7 @@ parameters: + repo: + uca: + source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main" +- architectures: amd64 ++ architectures: amd64,arm64 + key_id: EC4926EA + key_server: keyserver.ubuntu.com + kernel: +diff --git a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml +index d677420..fbbc7ef 100644 +--- a/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml ++++ b/mcp/reclass/classes/cluster/virtual-mcp-pike-common-noha/openstack_init.yml +@@ -98,7 +98,7 @@ parameters: + repo: + uca: + source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main" +- architectures: amd64 ++ architectures: amd64,arm64 + key_id: EC4926EA + key_server: keyserver.ubuntu.com + kernel: diff --git a/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch index 3b4f7f31..000c32c7 100644 --- a/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch @@ -14,25 +14,30 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> --- - mcp/config/states/virtual_control_plane | 2 ++ - mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml | 4 ++++ - mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++ - 3 files changed, 13 insertions(+) + mcp/config/states/baremetal_init | 1 + + mcp/config/states/virtual_control_plane | 1 + + mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml | 4 ++++ + mcp/salt-formulas/opnfv/adduser.sls | 7 +++++++ + 4 files changed, 13 insertions(+) create mode 100644 mcp/salt-formulas/opnfv/adduser.sls -diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index d8d2d02..f326f4c 100755 ---- a/mcp/config/states/virtual_control_plane -+++ b/mcp/config/states/virtual_control_plane -@@ -37,6 +37,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ +diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init +index 67022b0..5943e03 100755 +--- a/mcp/config/states/baremetal_init ++++ b/mcp/config/states/baremetal_init +@@ -23,6 +23,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ repl="\n if not __salt__['pkg.version']('vlan'):\n __salt__['pkg.install']('vlan')" salt -C 'kvm*' pkg.install bridge-utils -+salt -C '*' state.apply opnfv.adduser ++salt -C 'kvm* or cmp*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network salt -C 'cmp*' state.apply linux.system salt -C 'cmp*' state.apply linux.network || true -@@ -66,6 +67,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do +diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane +index 1cfcacd..58a1843 100755 +--- a/mcp/config/states/virtual_control_plane ++++ b/mcp/config/states/virtual_control_plane +@@ -47,6 +47,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do rc=0 for node in $vcp_nodes; do salt "$node" test.ping 2>/dev/null || { rc=$?; break; }; @@ -40,14 +45,14 @@ index d8d2d02..f326f4c 100755 done sleep 5 ((attempt+=1)) -diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml -index aa780e6..e4069c0 100644 ---- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml -+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml +diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml +index f09ee5d..39d550a 100644 +--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml ++++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/init.yml @@ -9,3 +9,7 @@ classes: - - cluster.all-mcp-ocata-common.opnfv.runtime - - cluster.all-mcp-ocata-common.opnfv.pod_config + - cluster.all-mcp-arch-common.arch + - cluster.all-mcp-arch-common.opnfv +parameters: + _param: + opnfv_user_username: opnfv diff --git a/patches/opnfv-fuel/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch b/patches/opnfv-fuel/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch deleted file mode 100644 index 9c03bf6e..00000000 --- a/patches/opnfv-fuel/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch +++ /dev/null @@ -1,101 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Wed, 30 Aug 2017 22:15:07 +0200 -Subject: [PATCH] baremetal, virtual: Extend arch list for UCA repo - -JIRA: https://jira.opnfv.org/browse/ARMBAND-304 - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - .../classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml | 2 +- - .../cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml | 2 +- - .../classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml | 2 +- - .../classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml | 2 +- - .../classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml | 2 +- - .../classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml -index 9a04c84..80e5bb7 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml -@@ -27,7 +27,7 @@ parameters: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" -- architectures: amd64 -+ architectures: amd64,arm64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com - kernel: -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml -index e610dc9..47f4b09 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml -@@ -26,7 +26,7 @@ parameters: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" -- architectures: amd64 -+ architectures: amd64,arm64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com - network: -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml -index 5e855ac..2392cf0 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml -@@ -27,7 +27,7 @@ parameters: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" -- architectures: amd64 -+ architectures: amd64,arm64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com - kernel: -diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml -index 9ed3a80..e865d5c 100644 ---- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml -+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml -@@ -20,6 +20,6 @@ parameters: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" -- architectures: amd64 -+ architectures: amd64,arm64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml -index ad06754..d4e1c40 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml -@@ -65,7 +65,7 @@ parameters: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" -- architectures: amd64 -+ architectures: amd64,arm64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com - kernel: -diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml -index 5be63e5..1cfd5a3 100644 ---- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml -+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml -@@ -17,7 +17,7 @@ parameters: - repo: - uca: - source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" -- architectures: amd64 -+ architectures: amd64,arm64 - key_id: EC4926EA - key_server: keyserver.ubuntu.com - network: diff --git a/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch b/patches/opnfv-fuel/0013-baremetal-linux-image-generic-hwe-16.04-edge.patch index 7f9ccc5d..40d5608f 100644 --- a/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch +++ b/patches/opnfv-fuel/0013-baremetal-linux-image-generic-hwe-16.04-edge.patch @@ -27,16 +27,16 @@ JIRA: ARMBAND-280 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - mcp/config/states/virtual_control_plane | 5 ++++- + mcp/config/states/baremetal_init | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane -index f326f4c..347b2b5 100755 ---- a/mcp/config/states/virtual_control_plane -+++ b/mcp/config/states/virtual_control_plane -@@ -39,9 +39,12 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ +diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init +index 5943e03..0e6fd29 100755 +--- a/mcp/config/states/baremetal_init ++++ b/mcp/config/states/baremetal_init +@@ -25,9 +25,12 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \ salt -C 'kvm*' pkg.install bridge-utils - salt -C '*' state.apply opnfv.adduser + salt -C 'kvm* or cmp*' state.apply opnfv.adduser salt -C 'kvm*' state.apply linux.network -salt -C 'cmp*' state.apply linux.system +salt -C 'kvm* or cmp*' state.apply linux.system diff --git a/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch b/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch deleted file mode 100644 index b5096dd6..00000000 --- a/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch +++ /dev/null @@ -1,382 +0,0 @@ -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Fri, 24 Nov 2017 20:28:01 +0100 -Subject: [PATCH] Add pre-{install,purge} support for base image - -Extend <lib.sh> and its invocation from <ci.deploy.sh> with -support for modifying foundation node VMs base image prior to -using it with: -- additional APT GPG keys; -- additional APT repos; -- packages to pre-install; -- packages to pre-remove; -- (non-configurable) cloud init datasource via NoCloud only, - so VCP VMs won't wait for metadata service; - -While at it, re-use the resulting image as a base for another -round of pre-patching (same operations as above are supported) -to provide a base image for VCP VMs. - -Add AArch64-specific configuration based on new mechanisms: -- pre-install linux-image-generic-hwe-16.04-edge (and headers) - for foundation node and VCP (common) image (also requires new - repo and its key); -- pre-install cloud-init for VCP image (it should already be - installed, but script needs non-empty config for VCP to create - the VCP image and transfer it over to Salt Master); - -NOTE: cloud-init is required on VCP VMs for DHCP on 1st iface. - -JIRA: FUEL-309 - -Change-Id: I7dcaf0ffd9c57009133c6d339496ec831ab14375 -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - .gitignore | 1 + - ci/deploy.sh | 23 +++- - mcp/config/scenario/defaults-aarch64.yaml | 18 +++ - .../cluster/all-mcp-ocata-common/aarch64/init.yml | 2 +- - mcp/scripts/lib.sh | 137 ++++++++++++++++++++- - mcp/scripts/salt.sh | 12 ++ - 6 files changed, 185 insertions(+), 8 deletions(-) - -diff --git a/.gitignore b/.gitignore -index 4e90f32..38b4440 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -13,3 +13,4 @@ - **/mcp/scripts/mcp.rsa* - **/mcp/scripts/user-data.sh - **/mcp/scripts/net_mcpcontrol.xml -+**/mcp/scripts/*.img -diff --git a/ci/deploy.sh b/ci/deploy.sh -index 0f42396..b88d2ba 100755 ---- a/ci/deploy.sh -+++ b/ci/deploy.sh -@@ -15,6 +15,7 @@ - do_exit () { - local RC=$? - clean -+ cleanup_mounts - if [ ${RC} -eq 0 ]; then - notify "\n[OK] MCP: Openstack installation finished succesfully!\n\n" 2 - else -@@ -158,6 +159,7 @@ NO_DEPLOY_ENVIRONMENT=${NO_DEPLOY_ENVIRONMENT:-0} - ERASE_ENV=${ERASE_ENV:-0} - - source "${DEPLOY_DIR}/globals.sh" -+source "${DEPLOY_DIR}/lib.sh" - - # - # END of variables to customize -@@ -340,7 +342,6 @@ fi - - # Get required infra deployment data - set +x --source lib.sh - eval "$(parse_yaml "${SCENARIO_DIR}/defaults-$(uname -i).yaml")" - eval "$(parse_yaml "${SCENARIO_DIR}/${DEPLOY_TYPE}/${DEPLOY_SCENARIO}.yaml")" - eval "$(parse_yaml "${LOCAL_PDF_RECLASS}")" -@@ -358,6 +359,23 @@ for node in "${virtual_nodes[@]}"; do - done - virtual_nodes_data=${virtual_nodes_data%|} - -+# Serialize repos, packages to (pre-)install/remove for: -+# - foundation node VM base image (virtual: all VMs, baremetal: cfg01|mas01) -+# - virtualized control plane VM base image (only when VCP is used) -+base_image_flavors=common -+if [[ "${cluster_states[*]}" =~ virtual_control ]]; then -+ base_image_flavors+=" control" -+fi -+for sc in ${base_image_flavors}; do -+ for va in apt_keys apt_repos pkg_install pkg_remove; do -+ key=virtual_${sc}_${va} -+ eval "${key}=\${${key}[@]// /|}" -+ eval "${key}=\${${key}// /,}" -+ virtual_repos_pkgs+="${!key}^" -+ done -+done -+virtual_repos_pkgs=${virtual_repos_pkgs%^} -+ - # Expand reclass and virsh network templates - for tp in "${RECLASS_CLUSTER_DIR}/all-mcp-ocata-common/opnfv/"*.template \ - net_*.template; do -@@ -413,7 +431,8 @@ elif [ ${USE_EXISTING_INFRA} -gt 0 ]; then - check_connection - else - generate_ssh_key -- prepare_vms "${base_image}" "${STORAGE_DIR}" "${virtual_nodes[@]}" -+ prepare_vms "${base_image}" "${STORAGE_DIR}" "${virtual_repos_pkgs}" \ -+ "${virtual_nodes[@]}" - create_networks "${OPNFV_BRIDGES[@]}" - create_vms "${STORAGE_DIR}" "${virtual_nodes_data}" "${OPNFV_BRIDGES[@]}" - update_mcpcontrol_network -diff --git a/mcp/config/scenario/defaults-aarch64.yaml b/mcp/config/scenario/defaults-aarch64.yaml -index 24a4037..d989819 100644 ---- a/mcp/config/scenario/defaults-aarch64.yaml -+++ b/mcp/config/scenario/defaults-aarch64.yaml -@@ -11,3 +11,21 @@ virtual: - default: - vcpus: 6 - ram: 4096 -+ common: -+ apt: -+ keys: -+ - https://linux.enea.com/mcp-repos/ocata/xenial/archive-mcpocata.key -+ repos: -+ # <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp> -+ - armband_openstack 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/ocata/xenial ocata main -+ - armband_mk_openstack 1100 deb [arch=arm64] http://linux.enea.com/apt-mk/xenial nightly ocata -+ # NOTE(armband): Empty repo, keep commented out as reference -+ # - armband_mcp_extra 1100 deb [arch=arm64] http://linux.enea.com/apt-mk/xenial nightly extra -+ pkg: -+ install: -+ - linux-image-generic-hwe-16.04-edge -+ - linux-headers-generic-hwe-16.04-edge -+ control: -+ pkg: -+ install: -+ - cloud-init -diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml -index b5b78ec..0350afa 100644 ---- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml -+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml -@@ -8,7 +8,7 @@ - --- - parameters: - _param: -- salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img -+ salt_control_xenial_image: salt://salt/files/control/images/base_image_opnfv_fuel_vcp.img - - # VMs spawned on Foundation Node / Jump Host net ifaces (max 4) - opnfv_fn_vm_primary_interface: enp1s0 -diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index c6d5d26..654f45e 100644 ---- a/mcp/scripts/lib.sh -+++ b/mcp/scripts/lib.sh -@@ -1,4 +1,5 @@ - #!/bin/bash -e -+# shellcheck disable=SC2155,SC1001 - ############################################################################## - # Copyright (c) 2017 Mirantis Inc., Enea AB and others. - # All rights reserved. This program and the accompanying materials -@@ -11,7 +12,6 @@ - # - - function generate_ssh_key { -- # shellcheck disable=SC2155 - local mcp_ssh_key=$(basename "${SSH_KEY}") - local user=${USER} - if [ -n "${SUDO_USER}" ] && [ "${SUDO_USER}" != 'root' ]; then -@@ -35,6 +35,110 @@ function get_base_image { - wget -P "${image_dir}" -N "${base_image}" - } - -+function mount_image { -+ local image=$1 -+ local image_dir=$2 -+ OPNFV_MNT_DIR="${image_dir}/ubuntu" -+ -+ sudo modprobe nbd loop -+ # Find free nbd, loop devices -+ for dev in '/sys/class/block/nbd'*; do -+ if [ "$(cat "${dev}/size")" = '0' ]; then -+ OPNFV_NBD_DEV=/dev/$(basename "${dev}") -+ break -+ fi -+ done -+ OPNFV_LOOP_DEV=$(losetup -f) -+ export OPNFV_MNT_DIR OPNFV_LOOP_DEV -+ [ -n "${OPNFV_NBD_DEV}" ] && [ -n "${OPNFV_LOOP_DEV}" ] || exit 1 -+ sudo qemu-nbd --connect="${OPNFV_NBD_DEV}" --aio=native --cache=none \ -+ "${image_dir}/${image}" -+ sleep 5 # /dev/nbdNp1 takes some time to come up -+ # grub-update does not like /dev/nbd*, so use a loop device to work around it -+ # Hardcode partition index to 1, unlikely to change for Ubuntu UCA image -+ sudo losetup "${OPNFV_LOOP_DEV}" "${OPNFV_NBD_DEV}p1" -+ mkdir -p "${OPNFV_MNT_DIR}" -+ sudo mount "${OPNFV_LOOP_DEV}" "${OPNFV_MNT_DIR}" -+ sudo mount -t proc proc "${OPNFV_MNT_DIR}/proc" -+ sudo mount -t sysfs sys "${OPNFV_MNT_DIR}/sys" -+ sudo mount -o bind /dev "${OPNFV_MNT_DIR}/dev" -+ sudo mkdir -p "${OPNFV_MNT_DIR}/run/resolvconf" -+ sudo cp /etc/resolv.conf "${OPNFV_MNT_DIR}/run/resolvconf" -+ echo "GRUB_DISABLE_OS_PROBER=true" | \ -+ sudo tee -a "${OPNFV_MNT_DIR}/etc/default/grub" -+} -+ -+function apt_repos_pkgs_image { -+ local apt_key_urls=(${1//,/ }) -+ local all_repos=(${2//,/ }) -+ local pkgs_i=(${3//,/ }) -+ local pkgs_r=(${4//,/ }) -+ [ -n "${OPNFV_MNT_DIR}" ] || exit 1 -+ -+ # APT keys -+ if [ "${#apt_key_urls[@]}" -gt 0 ]; then -+ for apt_key in "${apt_key_urls[@]}"; do -+ sudo chroot "${OPNFV_MNT_DIR}" /bin/bash -c \ -+ "wget -qO - '${apt_key}' | apt-key add -" -+ done -+ fi -+ # Additional repositories -+ for repo_line in "${all_repos[@]}"; do -+ # <repo_name>|<repo prio>|deb|[arch=<arch>]|<repo url>|<dist>|<repo comp> -+ local repo=(${repo_line//|/ }) -+ [ "${#repo[@]}" -gt 5 ] || continue -+ # NOTE: Names and formatting are compatible with Salt linux.system.repo -+ cat <<-EOF | sudo tee "${OPNFV_MNT_DIR}/etc/apt/preferences.d/${repo[0]}" -+ -+ Package: * -+ Pin: release a=${repo[-2]} -+ Pin-Priority: ${repo[1]} -+ -+ EOF -+ echo "${repo[@]:2}" | sudo tee \ -+ "${OPNFV_MNT_DIR}/etc/apt/sources.list.d/${repo[0]}.list" -+ done -+ # Install packages -+ if [ "${#pkgs_i[@]}" -gt 0 ]; then -+ sudo DEBIAN_FRONTEND="noninteractive" \ -+ chroot "${OPNFV_MNT_DIR}" apt-get update -+ sudo DEBIAN_FRONTEND="noninteractive" FLASH_KERNEL_SKIP="true" \ -+ chroot "${OPNFV_MNT_DIR}" apt-get install -y "${pkgs_i[@]}" -+ fi -+ # Remove packages -+ if [ "${#pkgs_r[@]}" -gt 0 ]; then -+ sudo DEBIAN_FRONTEND="noninteractive" FLASH_KERNEL_SKIP="true" \ -+ chroot "${OPNFV_MNT_DIR}" apt-get purge -y "${pkgs_r[@]}" -+ fi -+ # Disable cloud-init metadata service datasource -+ sudo mkdir -p "${OPNFV_MNT_DIR}/etc/cloud/cloud.cfg.d" -+ echo "datasource_list: [ NoCloud, None ]" | sudo tee \ -+ "${OPNFV_MNT_DIR}/etc/cloud/cloud.cfg.d/95_real_datasources.cfg" -+} -+ -+function cleanup_mounts { -+ # Remove any mounts, loop and/or nbd devs created while patching base image -+ if [ -n "${OPNFV_MNT_DIR}" ] && [ -d "${OPNFV_MNT_DIR}" ]; then -+ if [ -f "${OPNFV_MNT_DIR}/boot/grub/grub.cfg" ]; then -+ # Grub thinks it's running from a live CD -+ sudo sed -i -e 's/^\s*set root=.*$//g' -e 's/^\s*loopback.*$//g' \ -+ "${OPNFV_MNT_DIR}/boot/grub/grub.cfg" -+ fi -+ sudo rm -f "${OPNFV_MNT_DIR}/run/resolvconf/resolv.conf" -+ sync -+ if mountpoint -q "${OPNFV_MNT_DIR}"; then -+ sudo umount -l "${OPNFV_MNT_DIR}" || true -+ fi -+ fi -+ if [ -n "${OPNFV_LOOP_DEV}" ] && \ -+ losetup "${OPNFV_LOOP_DEV}" 1>&2 > /dev/null; then -+ sudo losetup -d "${OPNFV_LOOP_DEV}" -+ fi -+ if [ -n "${OPNFV_NBD_DEV}" ]; then -+ sudo qemu-nbd -d "${OPNFV_NBD_DEV}" || true -+ fi -+} -+ - function cleanup_uefi { - # Clean up Ubuntu boot entry if cfg01, kvm nodes online from previous deploy - # shellcheck disable=SC2086 -@@ -60,22 +164,45 @@ function cleanup_vms { - function prepare_vms { - local base_image=$1; shift - local image_dir=$1; shift -+ local repos_pkgs_str=$1; shift # ^-sep list of repos, pkgs to install/rm - local vnodes=("$@") -+ local image=base_image_opnfv_fuel.img - - cleanup_uefi - cleanup_vms - get_base_image "${base_image}" "${image_dir}" -+ -+ rm -f "${image_dir}/${image%.*}"* -+ if [[ ! "${repos_pkgs_str}" =~ ^\^+$ ]]; then -+ IFS='^' read -r -a repos_pkgs <<< "${repos_pkgs_str}" -+ cp "${image_dir}/${base_image/*\/}" "${image_dir}/${image}" -+ mount_image "${image}" "${image_dir}" -+ apt_repos_pkgs_image "${repos_pkgs[@]:0:4}" -+ cleanup_mounts -+ else -+ ln -sf "${image_dir}/${base_image/*\/}" "${image_dir}/${image}" -+ fi -+ -+ # CWD should be <mcp/scripts> - # shellcheck disable=SC2016 - envsubst '${SALT_MASTER},${CLUSTER_DOMAIN}' < \ - user-data.template > user-data.sh - -+ # Create config ISO and resize OS disk image for each foundation node VM - for node in "${vnodes[@]}"; do -- # create/prepare images - ./create-config-drive.sh -k "$(basename "${SSH_KEY}").pub" -u user-data.sh \ - -h "${node}" "${image_dir}/mcp_${node}.iso" -- cp "${image_dir}/${base_image/*\/}" "${image_dir}/mcp_${node}.qcow2" -+ cp "${image_dir}/${image}" "${image_dir}/mcp_${node}.qcow2" - qemu-img resize "${image_dir}/mcp_${node}.qcow2" 100G - done -+ -+ # VCP VMs base image specific changes -+ if [[ ! "${repos_pkgs_str}" =~ \^{3}$ ]] && [ -n "${repos_pkgs[*]:4}" ]; then -+ mount_image "${image}" "${image_dir}" -+ apt_repos_pkgs_image "${repos_pkgs[@]:4:4}" -+ cleanup_mounts -+ ln -sf "${image_dir}/${image}" "${image_dir}/${image%.*}_vcp.img" -+ fi - } - - function create_networks { -@@ -100,6 +227,8 @@ function create_networks { - - function create_vms { - local image_dir=$1; shift -+ # vnode data should be serialized with the following format: -+ # '<name0>,<ram0>,<vcpu0>|<name1>,<ram1>,<vcpu1>[...]' - IFS='|' read -r -a vnodes <<< "$1"; shift - local vnode_networks=("$@") - -@@ -139,9 +268,7 @@ function create_vms { - - function update_mcpcontrol_network { - # set static ip address for salt master node, MaaS node -- # shellcheck disable=SC2155 - local cmac=$(virsh domiflist cfg01 2>&1| awk '/mcpcontrol/ {print $5; exit}') -- # shellcheck disable=SC2155 - local amac=$(virsh domiflist mas01 2>&1| awk '/mcpcontrol/ {print $5; exit}') - virsh net-update "mcpcontrol" add ip-dhcp-host \ - "<host mac='${cmac}' name='cfg01' ip='${SALT_MASTER}'/>" --live -diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh -index ab096f3..b719aa8 100755 ---- a/mcp/scripts/salt.sh -+++ b/mcp/scripts/salt.sh -@@ -18,6 +18,8 @@ OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/opnfv" - OPNFV_GIT_DIR="/root/opnfv" - OPNFV_FUEL_DIR="/root/fuel" - OPNFV_RDIR="reclass/classes/cluster/all-mcp-ocata-common" -+OPNFV_VCP_IMG="mcp/scripts/base_image_opnfv_fuel_vcp.img" -+OPNFV_VCP_DIR="/srv/salt/env/prd/salt/files/control/images" - LOCAL_GIT_DIR="${F_GIT_ROOT%${F_GIT_SUBD}}" - LOCAL_PDF_RECLASS=$1 - NODE_MASK='*' -@@ -34,6 +36,11 @@ if [ -n "${LOCAL_PDF_RECLASS}" ] && [ -f "${LOCAL_PDF_RECLASS}" ]; then - rsync -e "ssh ${SSH_OPTS}" "${LOCAL_PDF_RECLASS}" \ - "${remote_tmp}${F_GIT_SUBD}/mcp/${OPNFV_RDIR}/opnfv/" - fi -+local_vcp_img=$(dirname "${LOCAL_PDF_RECLASS}")/$(basename "${OPNFV_VCP_IMG}") -+if [ -e "${local_vcp_img}" ]; then -+ rsync -L -e "ssh ${SSH_OPTS}" "${local_vcp_img}" \ -+ "${remote_tmp}${F_GIT_SUBD}/${OPNFV_VCP_IMG}" -+fi - - # ssh to cfg01 - # shellcheck disable=SC2086,2087 -@@ -95,4 +102,9 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END - salt -C "${NODE_MASK} and not cfg01*" pkg.upgrade refresh=False - - salt -C "${NODE_MASK} or cfg01*" state.sls ntp -+ -+ if [ -f "${OPNFV_FUEL_DIR}/${OPNFV_VCP_IMG}" ]; then -+ mkdir -p "${OPNFV_VCP_DIR}" -+ mv "${OPNFV_FUEL_DIR}/${OPNFV_VCP_IMG}" "${OPNFV_VCP_DIR}/" -+ fi - SALT_INSTALL_END diff --git a/patches/opnfv-fuel/0016-AArch64-base-image-pre-install-salt-minion.patch b/patches/opnfv-fuel/0016-AArch64-base-image-pre-install-salt-minion.patch deleted file mode 100644 index 1162b137..00000000 --- a/patches/opnfv-fuel/0016-AArch64-base-image-pre-install-salt-minion.patch +++ /dev/null @@ -1,104 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Mon, 27 Nov 2017 01:29:32 +0100 -Subject: [PATCH] AArch64: base image: pre-install salt-minion - -While at it, rename apt repo in foundation node user-data template -from "salt" to "saltstack", to align with reclass model naming. - -Change-Id: I5b216492349ae187b568884b1ab4046c52b1c6b2 -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - ci/deploy.sh | 4 ++-- - mcp/config/scenario/defaults-aarch64.yaml | 2 ++ - mcp/scripts/lib.sh | 8 +++++++- - mcp/scripts/user-data.template | 2 +- - 4 files changed, 12 insertions(+), 4 deletions(-) - -diff --git a/ci/deploy.sh b/ci/deploy.sh -index b88d2ba..8e1c3a5 100755 ---- a/ci/deploy.sh -+++ b/ci/deploy.sh -@@ -272,10 +272,10 @@ pushd "${DEPLOY_DIR}" > /dev/null - # Install required packages - [ -n "$(command -v apt-get)" ] && sudo apt-get install -y \ - git make rsync mkisofs curl virtinst cpu-checker qemu-kvm uuid-runtime \ -- libvirt-bin -+ libvirt-bin cloud-guest-utils e2fsprogs - [ -n "$(command -v yum)" ] && sudo yum install -y --skip-broken \ - git make rsync genisoimage curl virt-install qemu-kvm util-linux \ -- libvirt -+ libvirt cloud-utils-growpart e2fsprogs - - # For baremetal, python is indirectly required for PDF parsing - if [ "${DEPLOY_TYPE}" = 'baremetal' ]; then -diff --git a/mcp/config/scenario/defaults-aarch64.yaml b/mcp/config/scenario/defaults-aarch64.yaml -index d989819..edcd8d9 100644 ---- a/mcp/config/scenario/defaults-aarch64.yaml -+++ b/mcp/config/scenario/defaults-aarch64.yaml -@@ -17,6 +17,7 @@ virtual: - - https://linux.enea.com/mcp-repos/ocata/xenial/archive-mcpocata.key - repos: - # <repo name> <repo prio> deb [arch=<arch>] <repo url> <repo dist> <repo comp> -+ - saltstack 500 deb [arch=arm64] http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/2016.11 xenial main - - armband_openstack 1100 deb [arch=arm64] http://linux.enea.com/mcp-repos/ocata/xenial ocata main - - armband_mk_openstack 1100 deb [arch=arm64] http://linux.enea.com/apt-mk/xenial nightly ocata - # NOTE(armband): Empty repo, keep commented out as reference -@@ -25,6 +26,7 @@ virtual: - install: - - linux-image-generic-hwe-16.04-edge - - linux-headers-generic-hwe-16.04-edge -+ - salt-minion - control: - pkg: - install: -diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh -index 654f45e..8dd92e1 100644 ---- a/mcp/scripts/lib.sh -+++ b/mcp/scripts/lib.sh -@@ -51,11 +51,15 @@ function mount_image { - OPNFV_LOOP_DEV=$(losetup -f) - export OPNFV_MNT_DIR OPNFV_LOOP_DEV - [ -n "${OPNFV_NBD_DEV}" ] && [ -n "${OPNFV_LOOP_DEV}" ] || exit 1 -+ qemu-img resize "${image_dir}/${image}" 3G - sudo qemu-nbd --connect="${OPNFV_NBD_DEV}" --aio=native --cache=none \ - "${image_dir}/${image}" - sleep 5 # /dev/nbdNp1 takes some time to come up -- # grub-update does not like /dev/nbd*, so use a loop device to work around it - # Hardcode partition index to 1, unlikely to change for Ubuntu UCA image -+ if sudo growpart "${OPNFV_NBD_DEV}" 1; then -+ sudo e2fsck -yf "${OPNFV_NBD_DEV}p1" && sudo resize2fs "${OPNFV_NBD_DEV}p1" -+ fi -+ # grub-update does not like /dev/nbd*, so use a loop device to work around it - sudo losetup "${OPNFV_LOOP_DEV}" "${OPNFV_NBD_DEV}p1" - mkdir -p "${OPNFV_MNT_DIR}" - sudo mount "${OPNFV_LOOP_DEV}" "${OPNFV_MNT_DIR}" -@@ -66,6 +70,8 @@ function mount_image { - sudo cp /etc/resolv.conf "${OPNFV_MNT_DIR}/run/resolvconf" - echo "GRUB_DISABLE_OS_PROBER=true" | \ - sudo tee -a "${OPNFV_MNT_DIR}/etc/default/grub" -+ sudo sed -i -e 's/^\(GRUB_TIMEOUT\)=.*$/\1=1/g' -e 's/^GRUB_HIDDEN.*$//g' \ -+ "${OPNFV_MNT_DIR}/etc/default/grub" - } - - function apt_repos_pkgs_image { -diff --git a/mcp/scripts/user-data.template b/mcp/scripts/user-data.template -index 6752039..b654477 100644 ---- a/mcp/scripts/user-data.template -+++ b/mcp/scripts/user-data.template -@@ -11,7 +11,7 @@ if [ "$(uname -i)" = "aarch64" ]; then - SALT_REPO=linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/2016.11 - fi - wget -O - "https://${SALT_REPO}/SALTSTACK-GPG-KEY.pub" | sudo apt-key add - --echo "deb https://${SALT_REPO} xenial main" > /etc/apt/sources.list.d/salt.list -+echo "deb https://${SALT_REPO} xenial main" > /etc/apt/sources.list.d/saltstack.list - apt update - apt-get install -y salt-minion - rm /etc/salt/minion_id diff --git a/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch b/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch index 43d1e6a2..b4f76557 100644 --- a/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch +++ b/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch @@ -12,23 +12,39 @@ Subject: [PATCH] linux.system.repo.mcp: Add Armband repos Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - linux/system/repo/mcp/armband/extra.yml | 14 ++++++++++++++ - linux/system/repo/mcp/armband/openstack.yml | 21 +++++++++++++++++++++ - 2 files changed, 35 insertions(+) - create mode 100644 linux/system/repo/mcp/armband/extra.yml - create mode 100644 linux/system/repo/mcp/armband/openstack.yml + linux/system/repo/mcp/armband.yml | 12 ++++++++++++ + linux/system/repo/mcp/extra.yml | 10 ++++++++++ + linux/system/repo/mcp/openstack.yml | 17 +++++++++++++++++ + 3 files changed, 39 insertions(+) + create mode 100644 linux/system/repo/mcp/armband.yml -diff --git a/linux/system/repo/mcp/armband/extra.yml b/linux/system/repo/mcp/armband/extra.yml +diff --git a/linux/system/repo/mcp/armband.yml b/linux/system/repo/mcp/armband.yml new file mode 100644 -index 0000000..5b10e19 +index 0000000..d1fa43a --- /dev/null -+++ b/linux/system/repo/mcp/armband/extra.yml -@@ -0,0 +1,14 @@ ++++ b/linux/system/repo/mcp/armband.yml +@@ -0,0 +1,12 @@ +parameters: -+ # Armband only provides apt_mk_version=nightly for now + linux: + system: + repo: ++ armband: ++ source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-armband main" ++ architectures: arm64 ++ key_url: "https://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key" ++ pin: ++ - pin: 'release l=${_param:openstack_version}-armband' ++ priority: 1100 ++ package: '*' +diff --git a/linux/system/repo/mcp/extra.yml b/linux/system/repo/mcp/extra.yml +index 9839a23..ad9b5ce 100644 +--- a/linux/system/repo/mcp/extra.yml ++++ b/linux/system/repo/mcp/extra.yml +@@ -14,3 +14,13 @@ parameters: + - pin: 'release a=${_param:linux_system_repo_mcp_extra_version}' + priority: 1100 + package: '*' ++ # Armband only provides apt_mk_version=nightly for now + armband_mcp_extra: + source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly extra" + architectures: arm64 @@ -38,30 +54,28 @@ index 0000000..5b10e19 + - pin: 'release a=nightly' + priority: 1100 + package: '*' -diff --git a/linux/system/repo/mcp/armband/openstack.yml b/linux/system/repo/mcp/armband/openstack.yml -new file mode 100644 -index 0000000..6aa4fa0 ---- /dev/null -+++ b/linux/system/repo/mcp/armband/openstack.yml -@@ -0,0 +1,21 @@ -+parameters: -+ # Armband only provides apt_mk_version=nightly for now -+ linux: -+ system: -+ repo: +diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml +index 465b75d..22defb7 100644 +--- a/linux/system/repo/mcp/openstack.yml ++++ b/linux/system/repo/mcp/openstack.yml +@@ -21,3 +21,20 @@ parameters: + - pin: 'release l=${_param:linux_system_repo_mk_openstack_version}' + priority: 1100 + package: '*' + armband_openstack: + source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version} main" + architectures: arm64 + key_url: "https://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}/archive-mcp${_param:openstack_version}.key" + pin: -+ - pin: 'release a=${_param:openstack_version}' ++ - pin: 'release l=${_param:openstack_version}' + priority: 1100 + package: '*' ++ # Armband only provides apt_mk_version=nightly for now + armband_mk_openstack: + source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly ${_param:openstack_version}" + architectures: arm64 + key_url: "https://linux.enea.com/apt-mk/public.gpg" + pin: -+ - pin: 'release a=nightly' ++ - pin: 'release l=nightly' + priority: 1100 + package: '*' diff --git a/patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch b/patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch index 1c33a3a8..5d344dd8 100644 --- a/patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch +++ b/patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch @@ -20,7 +20,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 2 deletions(-) diff --git a/linux/system/single/init.yml b/linux/system/single/init.yml -index 8de2dda..c702a48 100644 +index c7c583b..764dfe3 100644 --- a/linux/system/single/init.yml +++ b/linux/system/single/init.yml @@ -19,8 +19,6 @@ parameters: @@ -29,6 +29,6 @@ index 8de2dda..c702a48 100644 version: purged - mcelog: - version: latest - kernel: - modules: - - nf_conntrack + apt: + config: + compression-workaround: diff --git a/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch b/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch deleted file mode 100644 index 65578721..00000000 --- a/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch +++ /dev/null @@ -1,29 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Sun, 26 Nov 2017 17:55:13 +0100 -Subject: [PATCH] linux.system.repo.glusterfs: Add arm64 arch - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - linux/system/repo/glusterfs.yml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linux/system/repo/glusterfs.yml b/linux/system/repo/glusterfs.yml -index fb331f0..ffad938 100644 ---- a/linux/system/repo/glusterfs.yml -+++ b/linux/system/repo/glusterfs.yml -@@ -6,6 +6,6 @@ parameters: - repo: - glusterfs-ppa: - source: "deb http://ppa.launchpad.net/gluster/glusterfs-${_param:glusterfs_version}/ubuntu ${_param:linux_system_codename} main" -- architectures: amd64 -+ architectures: amd64,arm64 - key_id: 3FE869A9 - key_server: keyserver.ubuntu.com |