aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-common-ha
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-20 20:02:45 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-23 17:13:29 +0000
commitd7bf560e12151853c3121ba39ad9bf6bd47befcf (patch)
tree9a90683e6a0e8accd25881049da0509675b75f32 /mcp/reclass/classes/cluster/mcp-common-ha
parent5693a22613d2ba0bd454490646c8a29b47a74329 (diff)
[repos] Replace keyserver accesses with pillar GPG
JIRA: FUEL-392 Change-Id: Ia21840c7561a14a5eeed3d08bf89eb2dbf9acc3a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-ha')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/glusterfs_repo.yml6
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j28
2 files changed, 6 insertions, 8 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/glusterfs_repo.yml b/mcp/reclass/classes/cluster/mcp-common-ha/glusterfs_repo.yml
index ecf0e2dc4..b28cfe74a 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/glusterfs_repo.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/glusterfs_repo.yml
@@ -6,17 +6,17 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
---
+classes:
+ - system.linux.system.repo.keystorage.glusterfs
parameters:
_param:
glusterfs_version: "3.13"
linux:
system:
repo:
- glusterfs-ppa:
+ mcp_glusterfs:
# yamllint disable-line rule:line-length
source: "deb http://ppa.launchpad.net/gluster/glusterfs-${_param:glusterfs_version}/ubuntu ${_param:linux_system_codename} main"
- key_id: 3FE869A9
- key_server: keyserver.ubuntu.com
pin:
- package: '*'
pin: release o=LP-PPA-gluster-glusterfs-${_param:glusterfs_version}
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 79eafcd10..042a12557 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
@@ -7,6 +7,8 @@
##############################################################################
{%- import 'net_map.j2' as nm with context %}
---
+classes:
+ - cluster.all-mcp-arch-common.uca_repo
parameters:
_param:
# openstack service addresses
@@ -250,9 +252,6 @@ parameters:
system:
repo:
uca:
- source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
- key_id: EC4926EA
- key_server: keyserver.ubuntu.com
pin:
- pin: 'release o=Canonical'
priority: 1200
@@ -260,8 +259,7 @@ 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
+ key: ${_param:armband_key}
pin:
- pin: 'release a=${_param:openstack_version}-armband'
priority: 1201