From: Delia Popescu <delia.popescu@enea.com>
Date: Mon, 26 Mar 2018 11:16:33 +0000 (+0300)
Subject: Add pike staging repository
X-Git-Tag: opnfv-6.0.0~24^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F71%2F54471%2F6;p=fuel.git

Add pike staging repository

Append PPA repository to the existing UCA
Existing UCA repository is still necessary for maas

Change-Id: If545b37d30291d3708430c52593b7fbd03bd22e4
Signed-off-by: Delia Popescu <delia.popescu@enea.com>
---

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