aboutsummaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-10 18:09:26 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-05-22 18:17:44 +0200
commitd680c5fb86c3fd4b25e7b7f766064a6ef4bf9a3b (patch)
tree301d7de4e5caec317f7fc2257defd45fda6f848d /patches
parent76919718c06a6dd58d63a1bc9b699d56d9086cdb (diff)
[salt] Retire Armband Saltstack repos
Provided we take care of the minor consequences of relying strictly on upstream Saltstack amd64 repos on arm64 (since we don't use RAET, this means merely installing `python-futures` as a dependency of `python-tornado` on all minions), we can finally drop our Salstack arm64 repository. This implies installing python-futures on: - FN and VCP VMs (handled via lib.sh pre-patching); - baremetal nodes (handled via MaaS Curtin template for arm64 now); While at it, also handle other minor patch cleanup operations: * drop `system.linux.system.repo.mcp.armband`, already covered by: - lib.sh pre-patching for FN and VCP VM images; - maas.region.repositories for baremetal nodes; * switch glusterfs PPA repo arch from 'amd64,arm64' to None; * drop obsolete patch handling `mcelog` on AArch64; [1] https://github.com/salt-formulas/salt-formula-maas/pull/26 JIRA: ARMBAND-382 Change-Id: I34f3bd70ebf10395e8d4e70498ff3a144b4d9c3b 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.patch50
-rw-r--r--patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch (renamed from patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch)24
-rw-r--r--patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch (renamed from patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch)0
-rw-r--r--patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch (renamed from patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch)0
-rw-r--r--patches/opnfv-fuel/0004-maas-boot-resources-Add-arm64-architecture.patch (renamed from patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch)0
-rw-r--r--patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch164
-rw-r--r--patches/opnfv-fuel/0005-mcp-salt-formulas-armband-Extend-libvirt_domain.patch (renamed from patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch)6
-rw-r--r--patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch (renamed from patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch)22
-rw-r--r--patches/opnfv-fuel/0007-Add-opnfv-user-to-the-deployment.patch (renamed from patches/opnfv-fuel/0010-Add-opnfv-user-to-the-deployment.patch)0
-rw-r--r--patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch (renamed from patches/opnfv-fuel/0011-Revert-Get-back-to-the-GA-kernel.patch)2
-rw-r--r--patches/opnfv-fuel/0009-Set-volume-name-in-source-file-to-sdX.patch (renamed from patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch)4
-rw-r--r--patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch59
-rw-r--r--patches/reclass-system-salt-model/0001-linux.system.repo-Drop-arch-for-glusterfs-repo.patch (renamed from patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch)20
-rw-r--r--patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch56
-rw-r--r--patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch34
-rw-r--r--patches/reclass-system-salt-model/0002-linux.system.repo-Drop-arch-for-openstack-repo.patch (renamed from patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-openstack-repo.patch)4
16 files changed, 44 insertions, 401 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
deleted file mode 100644
index ecbe3a5..0000000
--- a/patches/opnfv-fuel/0001-baremetal-Add-Armband-Openstack-repos-to-kvm-cmp.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 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 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;
-
-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/mcp-pike-common-ha/infra/kvm.yml | 1 +
- mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
-index df230452..5bbe0fe4 100644
---- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
-+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
-@@ -7,6 +7,7 @@
- ##############################################################################
- ---
- classes:
-+ - system.linux.system.repo.mcp.armband
- - system.linux.system.repo.glusterfs
- - service.keepalived.cluster.single
- - system.glusterfs.server.volume.glance
-diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
-index 24acbacf..e9f95f2d 100644
---- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
-+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute.yml
-@@ -8,6 +8,7 @@
- ---
- classes:
- - system.linux.system.repo.mcp.openstack
-+ - system.linux.system.repo.mcp.armband
- - system.linux.system.repo.glusterfs
- - 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/0001-salt-formulas-Add-enable-armband-formula.patch
index ebcc806..a04780b 100644
--- a/patches/opnfv-fuel/0002-salt-formulas-Add-enable-armband-formula.patch
+++ b/patches/opnfv-fuel/0001-salt-formulas-Add-enable-armband-formula.patch
@@ -26,15 +26,15 @@ 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_ha | 1 +
- mcp/config/states/openstack_noha | 2 +
- mcp/config/states/virtual_control_plane | 1 +
- .../armband/files/nova-libvirt-aarch64-rollup.diff | 106 +++++++++++++++++++++
- mcp/salt-formulas/armband/init.sls | 7 ++
- mcp/salt-formulas/armband/nova_config.sls | 35 +++++++
- mcp/salt-formulas/armband/nova_libvirt.sls | 7 ++
- mcp/salt-formulas/armband/qemu_efi.sls | 2 +
- mcp/salt-formulas/armband/vgabios.sls | 7 ++
+ mcp/config/states/openstack_ha | 1 +
+ mcp/config/states/openstack_noha | 2 +
+ mcp/config/states/virtual_control_plane | 1 +
+ .../files/nova-libvirt-aarch64-rollup.diff | 106 ++++++++++++++++++
+ mcp/salt-formulas/armband/init.sls | 7 ++
+ mcp/salt-formulas/armband/nova_config.sls | 35 ++++++
+ 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, 168 insertions(+)
create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
create mode 100644 mcp/salt-formulas/armband/init.sls
@@ -44,7 +44,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
create mode 100644 mcp/salt-formulas/armband/vgabios.sls
diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
-index 77063d6c..e17f92a5 100755
+index a30f9af6..600aa76b 100755
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -52,6 +52,7 @@ salt -I 'neutron:server' state.sls neutron -b 1
@@ -53,8 +53,8 @@ index 77063d6c..e17f92a5 100755
salt -I 'nova:compute' state.sls nova
+wait_for 5.0 "salt -I 'nova:compute' state.sls armband"
- salt -C 'I@mongodb:server and *01*' state.sls mongodb || true
- wait_for 10.0 "salt -C 'I@mongodb:server and *01*' cmd.run 'mongo localhost:27017/admin'"
+ salt -I 'redis:cluster:role:master' state.sls redis
+ salt -I 'redis:server' state.sls redis
diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
index a266989a..77557caa 100755
--- a/mcp/config/states/openstack_noha
diff --git a/patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch b/patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
index c3ffa52..c3ffa52 100644
--- a/patches/opnfv-fuel/0003-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
+++ b/patches/opnfv-fuel/0002-vPDF-Use-arm-virtual2-POD-config-in-sample.patch
diff --git a/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch b/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
index c2f2c36..c2f2c36 100644
--- a/patches/opnfv-fuel/0004-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
+++ b/patches/opnfv-fuel/0003-mcp-salt-formulas-opendaylight-AArch64-leveldb.patch
diff --git a/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch b/patches/opnfv-fuel/0004-maas-boot-resources-Add-arm64-architecture.patch
index b13390f..b13390f 100644
--- a/patches/opnfv-fuel/0006-maas-boot-resources-Add-arm64-architecture.patch
+++ b/patches/opnfv-fuel/0004-maas-boot-resources-Add-arm64-architecture.patch
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
deleted file mode 100644
index b7c1bec..0000000
--- a/patches/opnfv-fuel/0005-maas-Add-curtin_userdata_arm64_generic_xenial.patch
+++ /dev/null
@@ -1,164 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 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, 7 Aug 2017 19:45:01 +0200
-Subject: [PATCH] maas: Add curtin_userdata_arm64_generic_xenial
-
-Add AArch64 specific configuration.
-While at it, preseed Armband common repo-comp for Pike, so we get
-the updated kernel & other packages from the start.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- ...-Add-curtin_userdata_arm64_generic_xenial.patch | 35 +++++++++++++++++++++
- mcp/patches/patches.list | 1 +
- .../cluster/mcp-pike-common-ha/infra/maas.yml | 36 ++++++++++++++++++++++
- .../files/curtin_userdata_arm64_generic_xenial | 35 +++++++++++++++++++++
- 4 files changed, 107 insertions(+)
- create mode 100644 mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
- create mode 100644 mcp/salt-formulas/maas/files/curtin_userdata_arm64_generic_xenial
-
-diff --git a/mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch b/mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
-new file mode 100644
-index 00000000..0368937d
---- /dev/null
-+++ b/mcp/patches/0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
-@@ -0,0 +1,35 @@
-+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-+Date: Sat, 5 Aug 2017 02:03:01 +0200
-+Subject: [PATCH] maas: Add curtin_userdata_arm64_generic_xenial
-+
-+Based on curtin_userdata_amd64_generic_xenial, add new arm64
-+specific configuration file:
-+- curtin_userdata_arm64_generic_xenial
-+
-+Requires Salt repo key and repo URL to be defined via reclass.
-+
-+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-+---
-+
-+diff --git a/maas/region.sls b/maas/region.sls
-+--- a/maas/region.sls
-++++ b/maas/region.sls
-+@@ -70,6 +70,18 @@
-+ - require:
-+ - pkg: maas_region_packages
-+
-++/etc/maas/preseeds/curtin_userdata_arm64_generic_xenial:
-++ file.managed:
-++ - source: salt://maas/files/curtin_userdata_arm64_generic_xenial
-++ - template: jinja
-++ - user: root
-++ - group: root
-++ - mode: 644
-++ - context:
-++ salt_master_ip: {{ region.salt_master_ip }}
-++ - require:
-++ - pkg: maas_region_packages
-++
-+ /root/.pgpass:
-+ file.managed:
-+ - source: salt://maas/files/pgpass
-diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 6a6e7a36..3632a92b 100644
---- a/mcp/patches/patches.list
-+++ b/mcp/patches/patches.list
-@@ -17,3 +17,4 @@
- /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
- /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
- /usr/share/salt-formulas/env: 0016-Set-boot-source-selections.patch
-+/usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.patch
-diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
-index e83de35c..226a4f66 100644
---- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
-+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
-@@ -41,6 +41,42 @@ parameters:
- enable_third_party_drivers: true
- network_discovery: 'enabled'
- default_min_hwe_kernel: ${_param:hwe_kernel}
-+ package_repositories:
-+ armband:
-+ name: armband
-+ enabled: '1'
-+ url: 'http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename}'
-+ distributions: '${_param:openstack_version}-armband'
-+ components: 'main'
-+ arches: 'arm64'
-+ key: &armband_key |
-+ -----BEGIN PGP PUBLIC KEY BLOCK-----
-+ Version: GnuPG v2.0.14 (GNU/Linux)
-+
-+ mQENBFagAroBCADWboNIjuF6lB1mWv2+EbvqY3lKl5mLKhr2DnSUkKeHUPBv8gNM
-+ qK8Q00AMIyPiyEhgjA+dWizZ+5aBgxoiY7oMeLJ2Xym36U/8SYq2BWd3SGCbMNoz
-+ SJDxDUSM/HFVs6atF1M3DY9oN65hSVnu4uy5Tu6asf6k4rhAyk0z4+pRcPBCu2vq
-+ mnGi3COM/+9PShrEKeVOx5W2vRJywUFuq8EDvQnRoJ0GvM28JiJIanw17YwIPxhg
-+ BKZVpZjan5X+ihVMXwA2h/G/FS5Omhd50RqV6LWSYs94VJJgYqHx8UMm7izcxI+P
-+ ct3IcbD195bPbJ+SbuiFe45ZLsdY1MyGiU2BABEBAAG0K0VuZWEgQXJtYmFuZCBE
-+ ZXZvcHMgVGVhbSA8YXJtYmFuZEBlbmVhLmNvbT6JATgEEwECACICGwMGCwkIBwMC
-+ BhUIAgkKCwQWAgMBAh4BAheABQJaY3bYAAoJEN6rkLp5irHRoQMH/0PYl0A/6eWw
-+ nQ/szhEFrr76Ln6wA4vEO+PiuWj9kTkZM2NaCnkisrIuHSPIVvOLfFmztbE6sKGe
-+ t+a2b7Jqw48DZ/gq508aZE4Q307ookxdCOrzIu/796hFO34yXg3sqZoJh3VmKIjY
-+ 4DL8yG1iAiQ5vOw3IFWQnATwIZUgaCcjmE7HGap+9ePuJfFuQ8mIG5cy28t8qocx
-+ AB/B2tucfBMwomYxKqgbLI5AG7iSt58ajvrrNa9f8IX7Ihj/jiuXhUwX+geEp98K
-+ IWVI1ftEthZvfBpZW4BS98J4z//dEPi31L4jb9RQXq3afF2RpXchDeUN85bW45nu
-+ W/9PMAlgE/U=
-+ =m+zE
-+ -----END PGP PUBLIC KEY BLOCK-----
-+ saltstack_armband:
-+ name: saltstack_armband
-+ enabled: '1'
-+ url: 'http://linux.enea.com/saltstack/apt/ubuntu/16.04/arm64/2016.11'
-+ distributions: '${_param:linux_system_codename}'
-+ components: 'main'
-+ arches: 'arm64'
-+ key: *armband_key
- subnets:
- opnfv_maas_pxe:
- name: ${_param:opnfv_infra_maas_pxe_network_address}/24
-diff --git a/mcp/salt-formulas/maas/files/curtin_userdata_arm64_generic_xenial b/mcp/salt-formulas/maas/files/curtin_userdata_arm64_generic_xenial
-new file mode 100644
-index 00000000..15d10a48
---- /dev/null
-+++ b/mcp/salt-formulas/maas/files/curtin_userdata_arm64_generic_xenial
-@@ -0,0 +1,35 @@
-+{%- from "maas/map.jinja" import cluster with context %}
-+{% raw %}
-+#cloud-config
-+debconf_selections:
-+ maas: |
-+ {{for line in str(curtin_preseed).splitlines()}}
-+ {{line}}
-+ {{endfor}}
-+{{if third_party_drivers and driver}}
-+early_commands:
-+ {{py: key_string = ''.join(['\\x%x' % x for x in map(ord, driver['key_binary'])])}}
-+ driver_00_get_key: /bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg
-+ driver_01_add_key: ["apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]
-+ driver_02_add: ["add-apt-repository", "-y", "deb {{driver['repository']}} {{node.get_distro_series()}} main"]
-+ driver_03_update_install: ["sh", "-c", "apt-get update --quiet && apt-get --assume-yes install {{driver['package']}}"]
-+ driver_04_load: ["sh", "-c", "depmod && modprobe {{driver['module']}}"]
-+{{endif}}
-+late_commands:
-+ maas: [wget, '--no-proxy', {{node_disable_pxe_url|escape.json}}, '--post-data', {{node_disable_pxe_data|escape.json}}, '-O', '/dev/null']
-+ salt_01_install: ["curtin", "in-target", "--", "apt-get", "-y", "install", "salt-minion"]
-+{% endraw %}
-+ salt_02_hostname_set: ["curtin", "in-target", "--", "echo", "{% raw %}{{node.hostname}}{% endraw %}.{{pillar.linux.system.domain}}"]
-+ salt_03_hostname_get: ["curtin", "in-target", "--", "sh", "-c", "echo 'id: {% raw %}{{node.hostname}}{% endraw %}.{{pillar.linux.system.domain}}' >> /etc/salt/minion"]
-+ salt_04_master: ["curtin", "in-target", "--", "sh", "-c", "echo 'master: {{ salt_master_ip }}' >> /etc/salt/minion"]
-+{% raw %}
-+{{if third_party_drivers and driver}}
-+ driver_00_key_get: curtin in-target -- sh -c "/bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg"
-+ driver_02_key_add: ["curtin", "in-target", "--", "apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]
-+ driver_03_add: ["curtin", "in-target", "--", "add-apt-repository", "-y", "deb {{driver['repository']}} {{node.get_distro_series()}} main"]
-+ driver_04_update_install: ["curtin", "in-target", "--", "apt-get", "update", "--quiet"]
-+ driver_05_install: ["curtin", "in-target", "--", "apt-get", "-y", "install", "{{driver['package']}}"]
-+ driver_06_depmod: ["curtin", "in-target", "--", "depmod"]
-+ driver_07_update_initramfs: ["curtin", "in-target", "--", "update-initramfs", "-u"]
-+{{endif}}
-+{% endraw %}
diff --git a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0005-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
index 37fb9dd..07c447b 100644
--- a/patches/opnfv-fuel/0007-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0005-mcp-salt-formulas-armband-Extend-libvirt_domain.patch
@@ -33,9 +33,9 @@ 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/baremetal_init | 1 +
- .../armband/files/salt-minion-aarch64-rollup.diff | 101 +++++++++++++++++++++
- mcp/salt-formulas/armband/salt_minion.sls | 7 ++
+ mcp/config/states/baremetal_init | 1 +
+ .../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/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch
index bb8a947..09dda59 100644
--- a/patches/opnfv-fuel/0008-virtng.py-virt.sls-Extend-libvirt_domain.patch
+++ b/patches/opnfv-fuel/0006-virtng.py-virt.sls-Extend-libvirt_domain.patch
@@ -23,11 +23,11 @@ specific values.
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 +
- .../cluster/mcp-pike-common-ha/infra/kvm.yml | 15 ++++++
- .../cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 | 3 ++
+ ...-virtng-module-Extend-libvirt_domain.patch | 54 +++++++++++++++++++
+ ...t-control-virt-Extend-libvirt_domain.patch | 51 ++++++++++++++++++
+ mcp/patches/patches.list | 2 +
+ .../cluster/mcp-pike-common-ha/infra/kvm.yml | 15 ++++++
+ .../cluster/mcp-pike-odl-ha/infra/kvm.yml.j2 | 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,20 +150,20 @@ index 00000000..78eb0bff
+
+ #salt_control_seed_{{ cluster_name }}_{{ node_name }}:
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 3632a92b..5bbacf56 100644
+index ce59395c..39e737d6 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
-@@ -18,3 +18,5 @@
+@@ -16,3 +16,5 @@
+ /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
/usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch
/usr/share/salt-formulas/env: 0016-Set-boot-source-selections.patch
- /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.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/mcp-pike-common-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
-index 5bbe0fe4..84b392e6 100644
+index df230452..3548155f 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm.yml
-@@ -53,21 +53,33 @@ parameters:
+@@ -52,21 +52,33 @@ parameters:
openstack.control:
cpu: 4
ram: 12288
@@ -197,7 +197,7 @@ index 5bbe0fe4..84b392e6 100644
disk_profile: xxlarge
net_profile: default
# stacklight.log:
-@@ -88,6 +100,9 @@ parameters:
+@@ -87,6 +99,9 @@ parameters:
openstack.proxy:
cpu: 2
ram: 2048
diff --git a/patches/opnfv-fuel/0010-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0007-Add-opnfv-user-to-the-deployment.patch
index a5196f3..a5196f3 100644
--- a/patches/opnfv-fuel/0010-Add-opnfv-user-to-the-deployment.patch
+++ b/patches/opnfv-fuel/0007-Add-opnfv-user-to-the-deployment.patch
diff --git a/patches/opnfv-fuel/0011-Revert-Get-back-to-the-GA-kernel.patch b/patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch
index 3432e85..f570a9b 100644
--- a/patches/opnfv-fuel/0011-Revert-Get-back-to-the-GA-kernel.patch
+++ b/patches/opnfv-fuel/0008-Revert-Get-back-to-the-GA-kernel.patch
@@ -18,7 +18,7 @@ This reverts commit d06bcfb72c44b507c3efee4de00f415869f48450.
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
-index 226a4f66..a2987423 100644
+index 238ae95a..3cdb8bf0 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/maas.yml
@@ -25,7 +25,7 @@ parameters:
diff --git a/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch b/patches/opnfv-fuel/0009-Set-volume-name-in-source-file-to-sdX.patch
index 452bd1a..65d58a7 100644
--- a/patches/opnfv-fuel/0012-Set-volume-name-in-source-file-to-sdX.patch
+++ b/patches/opnfv-fuel/0009-Set-volume-name-in-source-file-to-sdX.patch
@@ -12,8 +12,8 @@ Subject: [PATCH] Set volume name in source file to sdX
Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
---
- mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +-
- mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml | 2 +-
+ .../classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 | 2 +-
+ .../classes/cluster/mcp-pike-common-noha/openstack_control.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
diff --git a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch b/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
deleted file mode 100644
index 48c0572..0000000
--- a/patches/opnfv-fuel/0009-seedng-module-Add-AArch64-repo.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 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, 21 Aug 2017 20:42:00 +0200
-Subject: [PATCH] seedng: module: Add AArch64 repo
-
-salt custom py module seedng.py should use custom repo arg
-"-R linux.enea.com/saltstack" on AArch64 nodes.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- .../0105-seedng-module-Add-AArch64-repo.patch | 22 ++++++++++++++++++++++
- mcp/patches/patches.list | 1 +
- 2 files changed, 23 insertions(+)
- create mode 100644 mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
-
-diff --git a/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
-new file mode 100644
-index 00000000..d40e63b2
---- /dev/null
-+++ b/mcp/patches/0105-seedng-module-Add-AArch64-repo.patch
-@@ -0,0 +1,22 @@
-+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-+Date: Mon, 21 Aug 2017 02:03:01 +0200
-+Subject: [PATCH] seedng: module: Add AArch64 repo
-+
-+salt custom py module seedng.py should use custom repo arg
-+"-R linux.enea.com/saltstack" on AArch64 nodes.
-+
-+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-+---
-+
-+diff --git a/_modules/seedng.py b/_modules/seedng.py
-+--- a/_modules/seedng.py
-++++ b/_modules/seedng.py
-+@@ -257,6 +257,7 @@
-+ or salt.syspaths.BOOTSTRAP)
-+ # Exec the chroot command
-+- arg = 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2]))
-++ arg = '-R linux.enea.com/saltstack ' if os.uname()[-1] == 'aarch64' else ''
-++ arg += 'stable {0}'.format('.'.join(salt.version.__version__.split('.')[:2]))
-+ cmd = 'if type salt-minion; then exit 0; '
-+ cmd += 'else sh {0} -c /tmp {1}; fi'.format(
-+ os.path.join(tmppath, 'bootstrap-salt.sh'), arg)
-diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
-index 5bbacf56..d6e84a50 100644
---- a/mcp/patches/patches.list
-+++ b/mcp/patches/patches.list
-@@ -20,3 +20,4 @@
- /usr/share/salt-formulas/env: 0101-maas-Add-curtin_userdata_arm64_generic_xenial.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
-+/usr/share/salt-formulas/env: 0105-seedng-module-Add-AArch64-repo.patch
diff --git a/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch b/patches/reclass-system-salt-model/0001-linux.system.repo-Drop-arch-for-glusterfs-repo.patch
index a595509..1500f67 100644
--- a/patches/reclass-system-salt-model/0003-linux.system.repo.glusterfs-Add-arm64-arch.patch
+++ b/patches/reclass-system-salt-model/0001-linux.system.repo-Drop-arch-for-glusterfs-repo.patch
@@ -1,5 +1,5 @@
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Enea AB and others.
+: Copyright (c) 2018 Mirantis Inc., 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
@@ -8,22 +8,28 @@
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
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
+Subject: [PATCH] linux.system.repo: Drop arch for glusterfs repo
+
+Extending the arch list to 'amd64,arm64' would lead to doubling repo
+metadata downloads on all archs, while dropping it will allow APT to
+only download the repo metadata for the current system arch.
+
+To keep old behavior for amd64 and prevent multiple downloads, let's
+just drop the 'architectures' field.
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
- linux/system/repo/glusterfs.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ linux/system/repo/glusterfs.yml | 1 -
+ 1 file changed, 1 deletion(-)
diff --git a/linux/system/repo/glusterfs.yml b/linux/system/repo/glusterfs.yml
-index fb331f0..ffad938 100644
+index fb331f0f..4646c075 100644
--- a/linux/system/repo/glusterfs.yml
+++ b/linux/system/repo/glusterfs.yml
-@@ -6,6 +6,6 @@ parameters:
+@@ -6,6 +6,5 @@ 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
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 f1b7824..0000000
--- a/patches/reclass-system-salt-model/0001-linux.system.repo.mcp-Add-Armband-repos.patch
+++ /dev/null
@@ -1,56 +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
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- 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.yml b/linux/system/repo/mcp/armband.yml
-new file mode 100644
-index 0000000..d1fa43a
---- /dev/null
-+++ b/linux/system/repo/mcp/armband.yml
-@@ -0,0 +1,12 @@
-+parameters:
-+ 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
-+ key_url: "https://linux.enea.com/apt-mk/public.gpg"
-+ clean_file: true
-+ 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
deleted file mode 100644
index 859caea..0000000
--- a/patches/reclass-system-salt-model/0002-linux.system-AArch64-Remove-mcelog.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 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: Fri, 14 Jul 2017 19:26:11 +0000
-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.
-
-Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- linux/system/single/debian.yml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/linux/system/single/debian.yml b/linux/system/single/debian.yml
-index b4d08c9..ef8266a 100644
---- a/linux/system/single/debian.yml
-+++ b/linux/system/single/debian.yml
-@@ -10,8 +10,6 @@ parameters:
- version: latest
- cloud-init:
- version: purged
-- mcelog:
-- version: latest
- python-msgpack:
- version: latest
- unattended-upgrades:
diff --git a/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-openstack-repo.patch b/patches/reclass-system-salt-model/0002-linux.system.repo-Drop-arch-for-openstack-repo.patch
index 9fd02fa..1da4a21 100644
--- a/patches/reclass-system-salt-model/0004-linux.system.repo-Drop-arch-for-openstack-repo.patch
+++ b/patches/reclass-system-salt-model/0002-linux.system.repo-Drop-arch-for-openstack-repo.patch
@@ -1,5 +1,5 @@
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-: Copyright (c) 2018 Enea AB and others.
+: Copyright (c) 2018 Mirantis Inc., 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
@@ -27,7 +27,7 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
1 file changed, 1 deletion(-)
diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
-index 22defb75..302c7cb3 100644
+index 465b75d0..8de17774 100644
--- a/linux/system/repo/mcp/openstack.yml
+++ b/linux/system/repo/mcp/openstack.yml
@@ -7,7 +7,6 @@ parameters: