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, 0 insertions, 67 deletions

diff --git a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch b/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch
deleted file mode 100644
index 42fba2e0..00000000
--- a/patches/opnfv-fuel/0012-Add-opnfv-user-to-the-deployment.patch
+++ /dev/null
@@ -1,67 +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: Charalampos Kominos <Charalampos.Kominos@enea.com>
-Date: Fri, 1 Sep 2017 12:24:35 +0200
-Subject: [PATCH] Add opnfv user to the deployment
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
-Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
----
- mcp/config/states/virtual_control_plane                         | 2 ++
- mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml | 4 ++++
- mcp/salt-formulas/opnfv/adduser.sls                             | 7 +++++++
- 3 files changed, 13 insertions(+)
- create mode 100644 mcp/salt-formulas/opnfv/adduser.sls
-
-diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
-index 88a4488..298a9de 100755
---- a/mcp/config/states/virtual_control_plane
-+++ b/mcp/config/states/virtual_control_plane
-@@ -37,6 +37,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
-   repl="\n        if not __salt__['pkg.version']('vlan'):\n            __salt__['pkg.install']('vlan')"
-
- 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 'cmp*' state.apply linux.network || true
-@@ -66,6 +67,7 @@ while [ $rc -ne 0 ] && [ ${attempt} -lt ${total_attempts} ]; do
-   rc=0
-   for node in $vcp_nodes; do
-     salt "$node" test.ping 2>/dev/null || { rc=$?; break; };
-+    salt -C "$node" state.apply opnfv.adduser
-   done
-   sleep 5
-   ((attempt+=1))
-diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml
-index aa780e6..e4069c0 100644
---- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml
-+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml
-@@ -9,3 +9,7 @@
- classes:
-   - cluster.all-mcp-ocata-common.opnfv.runtime
-   - cluster.all-mcp-ocata-common.opnfv.pod_config
-+parameters:
-+  _param:
-+    opnfv_user_username: opnfv
-+    opnfv_user_password: $1$5/pIEHT1$XFBhNWW4Q8gYd19hczgPF1
-diff --git a/mcp/salt-formulas/opnfv/adduser.sls b/mcp/salt-formulas/opnfv/adduser.sls
-new file mode 100644
-index 0000000..78ef993
---- /dev/null
-+++ b/mcp/salt-formulas/opnfv/adduser.sls
-@@ -0,0 +1,7 @@
-+add_opnfv_user:
-+  user.present:
-+  - name: {{ salt['pillar.get']('_param:opnfv_user_username') }}
-+  - password: {{ salt['pillar.get']('_param:opnfv_user_password') }}
-+  - createhome: True
-+  - groups:
-+    - sudo