diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-03-31 04:40:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-31 04:40:51 +0000 |
| commit | 6b8d6ac3c71ec04f94ffa6dc4ef13211c3fea326 (patch) | |
| tree | a859c5bfa00f7c0c7945b6388986e881491f143c | |
| parent | e083cf6350a227da161b07d2c68d9aa200611b32 (diff) | |
| parent | fa3eaf93c3994b87430c1546cb30d208e774a134 (diff) | |
Merge "Add pike staging repository"
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2 | 5 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_init.yml | 7 |
2 files changed, 12 insertions, 0 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 3b890da03..9db8f35d2 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 @@ -249,6 +249,11 @@ parameters: linux: system: 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 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 46d7af4a8..cef0b5318 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 @@ -94,6 +94,13 @@ parameters: linux: system: repo: + 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 |