u/fuel: Bump & rebase for Pike upgrade

- virtual deploys will use only UCA repos, without Armband/MCP;
- base image pre-build is now upstream, drop our patches;
- drop p/fuel libvirtd group workaround, now upstream in Fuel@OPNFV;
- drop p/reclass glusterfs PPA arch extension, obsolete;
- refactor armband repos in system.repo.mcp into:
  * armband (new, contains kernel, libvirt etc.);
  * armband_openstack (move into system.repo.mcp.openstack);
  * armband_mk_openstack (move intro system.repo.mcp.openstack);
  * armband_mcp_extra (move into system.repo.mcp.extra);
- drop 'nova: Update console defaults for armv7, aarch64';
- minor rebase of nova libvirt driver patches in our roll-up;

JIRA: ARMBAND-335

Change-Id: Ic5b7736cdd1d1ad5ff25728925198e8ea3e6b5b1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

3 files changed, 41 insertions, 56 deletions

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