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>

1 files changed, 50 insertions, 0 deletions

diff --git a/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch b/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch
new file mode 100644
index 00000000..6a131c20
--- /dev/null
+++ b/patches/opnfv-fuel/0014-baremetal-linux-image-generic-hwe-16.04-edge.patch
@@ -0,0 +1,50 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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, 5 Nov 2017 21:02:17 +0100
+Subject: [PATCH] baremetal: linux-image-generic-hwe-16.04-edge
+
+The Salt way to pin the kernel version is via its reclass model, by
+defining system.kernel.version. However, this only works with
+explicit kernel package names and not with meta package names
+(e.g. linux-image-4.13.0-9916-generic is expected instead of
+      linux-image-generic-hwe-16.04-edge, which would break the
+`linux_kernel_old_absent` state).
+
+For now, let's explicitly call `pkg.install` for the kernel and
+headers packages, using the meta package name to ensure automatic
+fallback to Ubuntu packages if Armband repos are missing,
+respectively to automatically pick up new kernel package names
+in case of meta + kernel packages bump later.
+
+JIRA: ARMBAND-280
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ 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..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 \
+ salt -C 'kvm*' pkg.install bridge-utils
+ salt -C '*' state.apply opnfv.adduser
+ salt -C 'kvm*' state.apply linux.network
+-salt -C 'cmp*' state.apply linux.system
++salt -C 'kvm* or cmp*' state.apply linux.system
+ salt -C 'cmp*' state.apply linux.network || true
+ salt -C 'kvm*' state.apply armband.salt_minion || true
++# NOTE(armband): Should be later moved to reclass as system.kernel.version
++salt -C 'kvm* or cmp*' pkg.install \
++  linux-image-generic-hwe-16.04-edge,linux-headers-generic-hwe-16.04-edge
+ salt -C 'kvm* or cmp*' system.reboot
+ wait_for 90 "! salt -C 'kvm* or cmp*' test.ping | " \
+   "tee /dev/stderr | grep -Fq 'Not connected'"