diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-09-25 12:09:02 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-25 12:09:02 +0000 |
| commit | 8da1f1286f9a91f3dc3533f5c634f55dc09452f7 (patch) | |
| tree | 4956a8cce3e354169e6a222bfb9cc68c32019e6a /mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 | |
| parent | 1310f75e2b3eeecace62e7e565346f97996bfbda (diff) | |
| parent | 41ba73d2891f933c4d1f0e333fb9b5c7fe9c9322 (diff) | |
Merge "[repos] Replace keyserver accesses with pillar GPG" into stable/gambia
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2')
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 | 8 |
1 files changed, 3 insertions, 5 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 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 |