summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/mcp-common-noha
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-25 12:09:02 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-09-25 12:09:02 +0000
commit8da1f1286f9a91f3dc3533f5c634f55dc09452f7 (patch)
tree4956a8cce3e354169e6a222bfb9cc68c32019e6a /mcp/reclass/classes/cluster/mcp-common-noha
parent1310f75e2b3eeecace62e7e565346f97996bfbda (diff)
parent41ba73d2891f933c4d1f0e333fb9b5c7fe9c9322 (diff)
Merge "[repos] Replace keyserver accesses with pillar GPG" into stable/gambia
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-common-noha')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j25
1 files changed, 2 insertions, 3 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
index 5aae27c41..26a4bac73 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/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_region: RegionOne
@@ -120,9 +122,6 @@ parameters:
net.ipv4.tcp_fin_timeout: 30
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