From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Thu, 2 Aug 2018 14:12:27 +0000 (+0200)
Subject: [ha] AArch64: Add missing GPG key for armband repo
X-Git-Tag: opnfv-7.0.0~123^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F60525%2F1;p=fuel.git

[ha] AArch64: Add missing GPG key for armband repo

In a regular baremetal HA scenario, all cluster nodes are provisioned
via MaaS, which also adds the Enea GPG key to the APT keyring.
However, for a hybrid deployment, virtual nodes are not provisioned
by MaaS, so the GPG key should be added to reclass pillar data
explicitly for Salt to be able to import it.

JIRA: FUEL-338

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

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
index 9be8b4543..b575d596c 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2
@@ -263,6 +263,8 @@ parameters:
 {%- if 'aarch64' in nm.cluster.arch %}
         armband_3:  # Should be in sync with the repo config generated via curtin/MaaS
           source: "deb http://linux.enea.com/mcp-repos/${_param:openstack_version}/${_param:linux_system_codename} ${_param:openstack_version}-armband main"
+          key_id: 798AB1D1
+          key_server: keys.gnupg.net
           pin:
             - pin: 'release a=${_param:openstack_version}-armband'
               priority: 1201