From a021366c0934d74889ac7d64e0857e35bdd0319c Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Fri, 18 May 2018 16:51:21 +0400
Subject: [ha] Align package repositories on all the nodes

Change-Id: Idd09d28677b109b4c0c5a4c232dcfb7c4f24dbd7
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 .../cluster/mcp-pike-common-ha/openstack_control.yml.j2       | 11 +----------
 .../cluster/mcp-pike-common-ha/openstack_control_init.yml     |  1 -
 .../classes/cluster/mcp-pike-common-ha/openstack_init.yml.j2  |  4 ----
 .../classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2 |  1 +
 .../cluster/mcp-pike-common-ha/openstack_telemetry.yml        |  2 +-
 5 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
index 6f7b33e3d..599c48e80 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2
@@ -7,6 +7,7 @@
 ##############################################################################
 ---
 classes:
+  - system.linux.system.repo.mcp.openstack
   - system.linux.system.repo.glusterfs
   - system.ceilometer.client
   - system.memcached.server.single
@@ -21,7 +22,6 @@ classes:
   - system.designate.server.backend.bind
   - system.bind.server.single
   - system.haproxy.proxy.listen.openstack.nova-placement
-  - system.haproxy.proxy.listen.openstack.glare
   - system.glusterfs.client.cluster
   - system.glusterfs.client.volume.glance
   - system.glusterfs.client.volume.keystone
@@ -82,15 +82,6 @@ parameters:
         host: ${_param:openstack_proxy_control_address}
         port: 8003
         protocol: http
-  nova:
-    controller:
-      pkgs:
-        - nova-api
-        - nova-conductor
-        - nova-consoleauth
-        - nova-novncproxy
-        - nova-scheduler
-        - python-novaclient
 {%- else %}
   libvirt:
     server:
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_init.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_init.yml
index 7c1fac5f9..e3517b16e 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_init.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control_init.yml
@@ -12,6 +12,5 @@ classes:
   - system.keystone.client.service.ceilometer
   - system.keystone.client.service.nova21
   - system.keystone.client.service.nova-placement
-  - system.keystone.client.service.glare
   - system.keystone.client.service.cinder3
   - system.keystone.client.service.designate
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 f6533855b..592843584 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
@@ -248,10 +248,6 @@ parameters:
   linux:
     system:
       repo:
-        uca-staging:
-          source: "deb http://ppa.launchpad.net/ubuntu-cloud-archive/${_param:openstack_version}-staging/ubuntu xenial main"
-          key_id: 9F68104E
-          key_server: keyserver.ubuntu.com
         uca:
           source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/${_param:openstack_version} main"
           key_id: EC4926EA
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2
index 26943b7b6..63a5d3af9 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_proxy.yml.j2
@@ -7,6 +7,7 @@
 ##############################################################################
 ---
 classes:
+  - system.linux.system.repo.mcp.openstack
   - system.nginx.server.single
   - system.nginx.server.proxy.openstack_api
   - system.nginx.server.proxy.openstack_vnc
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml
index a42189a80..17af1b380 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_telemetry.yml
@@ -7,7 +7,7 @@
 ##############################################################################
 ---
 classes:
-  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.mcp.openstack
   - system.mongodb.server.cluster
   - system.mongodb.server.database.ceilometer
   - system.ceilometer.server.backend.mongodb
-- 
cgit 1.2.3-korg