summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-02 16:12:27 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-02 17:22:40 +0200
commitd49daac0c77579fcf52f5a996989e15fd385cbc0 (patch)
tree6342e71fc8bf4001a7c99b12b17dbffc17c6a2a6
parenta1c39dbc47a77f80c59358158810664cbc44ea56 (diff)
[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>
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j22
1 files changed, 2 insertions, 0 deletions
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