[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>
(cherry picked from commit d680c5fb86c3fd4b25e7b7f766064a6ef4bf9a3b)

4 files changed, 15 insertions, 99 deletions

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 a5955091..1500f674 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 f1b7824b..00000000
--- 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 859caeaf..00000000
--- 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 9fd02fa1..1da4a212 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: