summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-04-12 11:40:50 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-04-12 11:40:50 +0000
commitbb19f9ca7eb60af02523e85c9146f676e0d2952b (patch)
tree3e54005ec018c0b884a378475e582cae69dd83df
parent20de635a813e0b1ccc37162f00ba4908e8d4663e (diff)
parentf833506ce0e77881da0916af5863768dbbc09687 (diff)
Merge "[UCA] Stop enforcing repository architecture" into stable/fraser
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml2
2 files changed, 0 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
index 9db8f35d2..603056622 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2
@@ -251,12 +251,10 @@ parameters:
repo:
uca-staging:
source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/${_param:openstack_version}-staging/ubuntu xenial main"
- architectures: amd64
key_id: 9F68104E
key_server: keyserver.ubuntu.com
uca:
source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
- architectures: amd64
key_id: EC4926EA
key_server: keyserver.ubuntu.com
kernel:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
index cef0b5318..7c6ce90b7 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml
@@ -97,13 +97,11 @@ parameters:
uca-staging:
# yamllint disable rule:line-length
source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/${_param:openstack_version}-staging/ubuntu xenial main"
- architectures: amd64
key_id: 9F68104E
key_server: keyserver.ubuntu.com
# yamllint enable rule:line-length
uca:
source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
- architectures: amd64
key_id: EC4926EA
key_server: keyserver.ubuntu.com
kernel: