diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-26 05:43:39 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-26 22:26:00 +0100 |
commit | 37083673d6cdddbb9b710f4dd5efe832753e5856 (patch) | |
tree | a0ef84e1ab70b5f1aca9254c3664847c056ab474 /patches | |
parent | d8dd9847b7a534b3c78af1b3eb772f07a3543d0c (diff) |
u/fuel: Bump & rebase for image pre-install
1. Bump to latest Fuel@OPNFV to include:
- Bring in newer glusterfs for mtime unsplit brain
* Requires adding arch "arm64" to PPA definition in reclass:
- (reclass-system) linux.system.repo.glusterfs: Add arm64 arch
- Switch nofeature-ha compute nodes to UCA repo
* Requires an alternative way of adding linux.enea.com repos;
* linux.enea.com repos will now be pre-install into VM images;
* Requires refresh on repo arch list handled by Armband patch:
- (fuel) baremetal, virtual: Extend arch list for UCA repo
2. Staging proposed patches from upstream Fuel@OPNFV:
- Add pre-{install,purge} support for base image
* Reference implementation adds pre-installed Armband specifics:
- Enea public GPG to APT keys (for below repos);
- repos (linux.enea.com/{apt-mk,mcp-repos}/*);
- linux-{image,headers}-generic-hwe-16.04-edge;
- cloud-init: datasource from NoCloud only;
* Allows us to drop kernel installation from state files,
installing the kernel only once during image prep, instead of
two stages of parallel installs (5 baremetal, 14 VCP);
* Ensures Armband repos are pre-configured for infrastructure
VMs, allowing us to drop more reclass repo definitions;
* Rework armband patch to install kernel only on kvm, cmp:
- (fuel) baremetal: linux-image-generic-hwe-16.04-edge
3. Sync reclass repo definitions with upstream change, drop duplicates
- [linux][repos] Remove unused repositories [1]
* Upstream dropped all "ocata-{security,hotfix,...} repo comps,
which are also empty for Armband, so drop them too;
* Rework following armband patches:
- (reclass-system) linux/system/repo/mcp: Add Armband repos
* Move Armband repos to new dedicated reclass classes:
- linux.system.repo.mcp.armband.extra (currently empty);
- linux.system.repo.mcp.armband.openstack;
* Use HTTPS for fetching Enea Armband GPG key;
- (fuel) baremetal: Add Armband Openstack repos to kvm, cmp
* Consume defs introduced above only on baremetal nodes;
4. Sync documentation with Fuel@OPNFV (cp)
5. Add vim swap files to .gitignore
[1] https://github.com/Mirantis/reclass-system-salt-model/commit/1dd1b31
Change-Id: Ibab56279de86f08ad7cd9bc6761f4c525532f811
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch | 49 | ||||
-rw-r--r-- | patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch (renamed from patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch) | 0 | ||||
-rw-r--r-- | patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch (renamed from patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch) | 0 | ||||
-rw-r--r-- | patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch (renamed from patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch) | 0 | ||||
-rw-r--r-- | patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch (renamed from patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch) | 0 | ||||
-rw-r--r-- | patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch (renamed from patches/opnfv-fuel/0005-maas-boot-resources-Add-arm64-architecture.patch) | 0 | ||||
-rw-r--r-- | patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch (renamed from patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch) | 0 | ||||
-rw-r--r-- | patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch (renamed from patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch) | 0 | ||||
-rw-r--r-- | patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch (renamed from patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch) | 6 | ||||
-rw-r--r-- | patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch (renamed from patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch) | 0 | ||||
-rw-r--r-- | patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch (renamed from patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch) | 4 | ||||
-rw-r--r-- | patches/opnfv-fuel/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch (renamed from patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch) | 19 | ||||
-rw-r--r-- | patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch (renamed from patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch) | 0 | ||||
-rw-r--r-- | patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch (renamed from patches/opnfv-fuel/0013-baremetal-linux-image-generic-hwe-16.04-edge.patch) | 18 | ||||
-rw-r--r-- | patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch | 382 | ||||
-rw-r--r-- | patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch | 93 | ||||
-rw-r--r-- | patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch | 67 | ||||
-rw-r--r-- | patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch (renamed from patches/reclass-system-salt-model/0002-linux-system-AArch64-Remove-mcelog.patch) | 18 | ||||
-rw-r--r-- | patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch | 29 |
19 files changed, 560 insertions, 125 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 new file mode 100644 index 00000000..18d6529d --- /dev/null +++ b/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch @@ -0,0 +1,49 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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: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); + +These repos are pre-installed for all infrastructure VMs, so we only +handle them 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 + + 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 7138d68..9011e47 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 +@@ -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 +@@ -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.storage.loopback diff --git a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch index 2fef9ae3..2fef9ae3 100644 --- a/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch diff --git a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch index 1dc8f99b..1dc8f99b 100644 --- a/patches/opnfv-fuel/0002-network-public-Use-arm-virtual2-POD-config.patch +++ b/patches/opnfv-fuel/0003-network-public-Use-arm-virtual2-POD-config.patch diff --git a/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch index af8e35ef..af8e35ef 100644 --- a/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch +++ b/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch diff --git a/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch index 3e17f899..3e17f899 100644 --- a/patches/opnfv-fuel/0004-maas-Add-curtin_userdata_arm64_generic_xenial.patch +++ b/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch diff --git a/patches/opnfv-fuel/0005-maas-boot-resources-Add-arm64-architecture.patch b/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch index 91e13434..91e13434 100644 --- a/patches/opnfv-fuel/0005-maas-boot-resources-Add-arm64-architecture.patch +++ b/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch diff --git a/patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch b/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch index 581cd71f..581cd71f 100644 --- a/patches/opnfv-fuel/0006-libvirt-Use-libvirt-unix_sock_group.patch +++ b/patches/opnfv-fuel/0007-libvirt-Use-libvirt-unix_sock_group.patch diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch index 1ea8f5af..1ea8f5af 100644 --- a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0008-mcp-salt-formulas-armband-Extend-libvirt_domain.patch diff --git a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch index 6b84b840..187e8679 100644 --- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0009-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -160,10 +160,10 @@ index 688a9af..e618d57 100644 +/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 7f2f572..9698875 100644 +index 9011e47..d759675 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 -@@ -46,21 +46,33 @@ parameters: +@@ -49,21 +49,33 @@ parameters: openstack.control: cpu: 4 ram: 12288 @@ -197,7 +197,7 @@ index 7f2f572..9698875 100644 disk_profile: xxlarge net_profile: default # stacklight.log: -@@ -81,6 +93,9 @@ parameters: +@@ -84,6 +96,9 @@ parameters: openstack.proxy: cpu: 2 ram: 2048 diff --git a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch index 86a57386..86a57386 100644 --- a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch +++ b/patches/opnfv-fuel/0010-seedng-module-Add-AArch64-repo.patch diff --git a/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch b/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch index 7aef2328..ebf454f4 100644 --- a/patches/opnfv-fuel/0010-aarch64-skip-configuration-of-hugepages.patch +++ b/patches/opnfv-fuel/0011-aarch64-skip-configuration-of-hugepages.patch @@ -20,10 +20,10 @@ Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com> 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 a78850f..ce67588 100644 +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 -@@ -12,8 +12,8 @@ classes: +@@ -13,8 +13,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/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch index 3bc5d324..9c03bf6e 100644 --- a/patches/opnfv-fuel/0011-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch +++ b/patches/opnfv-fuel/0012-baremetal-virtual-Extend-arch-list-for-UCA-repo.patch @@ -17,9 +17,10 @@ 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 +- - 5 files changed, 5 insertions(+), 5 deletions(-) + 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 @@ -35,10 +36,10 @@ index 9a04c84..80e5bb7 100644 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 aa6b4e3..5b6752e 100644 +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 -@@ -25,7 +25,7 @@ parameters: +@@ -26,7 +26,7 @@ parameters: repo: uca: source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main" @@ -60,6 +61,18 @@ index 5e855ac..2392cf0 100644 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 diff --git a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch index 42fba2e0..42fba2e0 100644 --- a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch +++ b/patches/opnfv-fuel/0013-Add-opnfv-user-to-the-deployment.patch diff --git a/patches/opnfv-fuel/0013-baremetal-linux-image-generic-hwe-16.04-edge.patch b/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch index 58718995..6a131c20 100644 --- a/patches/opnfv-fuel/0013-baremetal-linux-image-generic-hwe-16.04-edge.patch +++ b/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch @@ -24,15 +24,14 @@ respectively to automatically pick up new kernel package names in case of meta + kernel packages bump later. JIRA: ARMBAND-280 -JIRA: ARMBAND-330 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - mcp/config/states/virtual_control_plane | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) + mcp/config/states/virtual_control_plane | 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 298a9de..c07d342 100755 +index 298a9de..f569ba2 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 \ @@ -49,14 +48,3 @@ index 298a9de..c07d342 100755 salt -C 'kvm* or cmp*' system.reboot wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \ "tee /dev/stderr | grep -Fq 'Not connected'" -@@ -84,3 +87,10 @@ wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_US - # Disable proxy dhcp routes after installation - salt -C 'prx*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \ - args='unset new_routers' -+ -+# NOTE(armband): Should be later moved to reclass as system.kernel.version -+salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' pkg.install \ -+ linux-image-generic-hwe-16.04-edge,linux-headers-generic-hwe-16.04-edge -+salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' system.reboot -+wait_for 90 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' test.ping | " \ -+ "tee /dev/stderr | grep -Fq 'Not connected'" 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 new file mode 100644 index 00000000..28a31396 --- /dev/null +++ b/patches/opnfv-fuel/0015-Add-pre-install-purge-support-for-base-image.patch @@ -0,0 +1,382 @@ +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 b13e18e..427850f 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/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 deleted file mode 100644 index b99fa735..00000000 --- a/patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch +++ /dev/null @@ -1,93 +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, 10 Jul 2017 15:31:08 +0000 -Subject: [PATCH] linux/system/repo/mcp: Add Armband repos - -FIXME: Use https for fetching Armband GPG key! - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ---- - linux/system/repo/mcp/extra.yml | 9 +++++++ - linux/system/repo/mcp/openstack.yml | 48 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 57 insertions(+) - -diff --git a/linux/system/repo/mcp/extra.yml b/linux/system/repo/mcp/extra.yml -index 826969b..01b9cc5 100644 ---- a/linux/system/repo/mcp/extra.yml -+++ b/linux/system/repo/mcp/extra.yml -@@ -14,3 +14,12 @@ parameters: - - pin: 'release a=${_param:linux_system_repo_mcp_extra_version}' - priority: 1100 - package: '*' -+ armband_mcp_extra: -+ source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly extra" -+ architectures: arm64 -+ key_url: "http://linux.enea.com/apt-mk/public.gpg" -+ clean_file: true -+ pin: -+ - pin: 'release a=nightly' -+ priority: 1100 -+ package: '*' -diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml -index 2235b2c..be8ffd2 100644 ---- a/linux/system/repo/mcp/openstack.yml -+++ b/linux/system/repo/mcp/openstack.yml -@@ -53,3 +53,51 @@ parameters: - - pin: 'release a=${_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: "http://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}' -+ priority: 1100 -+ package: '*' -+ armband_openstack_hotfix: -+ source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-hotfix main" -+ architectures: arm64 -+ key_url: "http://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}-hotfix' -+ priority: 1100 -+ package: '*' -+ armband_openstack_security: -+ source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-security main" -+ architectures: arm64 -+ key_url: "http://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}-security' -+ priority: 1100 -+ package: '*' -+ armband_openstack_updates: -+ source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-updates main" -+ architectures: arm64 -+ key_url: "http://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}-updates' -+ priority: 1100 -+ package: '*' -+ armband_openstack_holdback: -+ source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-holdback main" -+ architectures: arm64 -+ key_url: "http://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}-holdback' -+ priority: 1100 -+ package: '*' -+ 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: "http://linux.enea.com/apt-mk/public.gpg" -+ pin: -+ - pin: 'release a=nightly' -+ priority: 1100 -+ package: '*' 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 new file mode 100644 index 00000000..43d1e6a2 --- /dev/null +++ b/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch @@ -0,0 +1,67 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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, 10 Jul 2017 15:31:08 +0000 +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 + +diff --git a/linux/system/repo/mcp/armband/extra.yml b/linux/system/repo/mcp/armband/extra.yml +new file mode 100644 +index 0000000..5b10e19 +--- /dev/null ++++ b/linux/system/repo/mcp/armband/extra.yml +@@ -0,0 +1,14 @@ ++parameters: ++ # Armband only provides apt_mk_version=nightly for now ++ linux: ++ system: ++ repo: ++ armband_mcp_extra: ++ source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly extra" ++ architectures: arm64 ++ key_url: "https://linux.enea.com/apt-mk/public.gpg" ++ clean_file: true ++ pin: ++ - 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: ++ 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}' ++ priority: 1100 ++ package: '*' ++ 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' ++ 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 6f2b46ff..1c33a3a8 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 @@ -8,7 +8,7 @@ :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Date: Fri, 14 Jul 2017 19:26:11 +0000 -Subject: [PATCH] linux/system: AArch64: Remove mcelog +Subject: [PATCH] linux.system: AArch64: Remove mcelog mcelog is not available on AArch64 hardware, so skip trying to install it. This implies Ceilometer should not use mcelog on AArch64. @@ -16,16 +16,16 @@ it. This implies Ceilometer should not use mcelog on AArch64. Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - linux/system/single.yml | 2 -- + linux/system/single/init.yml | 2 -- 1 file changed, 2 deletions(-) -diff --git a/linux/system/single.yml b/linux/system/single.yml -index ef23a39..f07fa68 100644 ---- a/linux/system/single.yml -+++ b/linux/system/single.yml -@@ -11,8 +11,6 @@ parameters: - version: latest - cloud-init: +diff --git a/linux/system/single/init.yml b/linux/system/single/init.yml +index 8de2dda..c702a48 100644 +--- a/linux/system/single/init.yml ++++ b/linux/system/single/init.yml +@@ -19,8 +19,6 @@ parameters: + version: purged + unattended-upgrades: version: purged - mcelog: - version: latest 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 new file mode 100644 index 00000000..65578721 --- /dev/null +++ b/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch @@ -0,0 +1,29 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: 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 |