From 5652931324e9ae9495b9d731f53a482487b2f74f Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Wed, 16 May 2018 17:41:05 +0400
Subject: [noha] Align package repositories on all the nodes

* replace UCA repo with MCP one on the remaining nodes
* clean up haproxy out-of-use frontends:
  - Nova EC2 API
  - Glare API

Change-Id: If8e6de2d95387c92ae96ad6069ec788ab229e1ce
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 .../mcp-pike-common-noha/haproxy_openstack_api.yml | 23 ----------------------
 .../mcp-pike-common-noha/openstack_control.yml     | 14 ++++++-------
 .../mcp-pike-common-noha/openstack_gateway.yml     |  1 +
 .../mcp-pike-common-noha/openstack_init.yml        | 11 -----------
 4 files changed, 7 insertions(+), 42 deletions(-)

(limited to 'mcp')

diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml
index 21653d7cb..7235071f5 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/haproxy_openstack_api.yml
@@ -45,17 +45,6 @@ parameters:
               host: ${_param:cluster_node01_address}
               port: 9191
               params: ${_param:haproxy_check}
-        glare:
-          type: general-service
-          service_name: glare
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 9494
-          servers:
-            - name: ctl01
-              host: ${_param:cluster_node01_address}
-              port: 9494
-              params: ${_param:haproxy_check}
         heat_cloudwatch_api:
           type: openstack-service
           service_name: heat
@@ -139,18 +128,6 @@ parameters:
               host: ${_param:cluster_node01_address}
               port: 8778
               params: ${_param:haproxy_check}
-        nova_ec2_api:
-          type: general-service
-          service_name: nova
-          check: false
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 8773
-          servers:
-            - name: ctl01
-              host: ${_param:cluster_node01_address}
-              port: 8773
-              params: ${_param:haproxy_check}
         nova_api:
           type: openstack-service
           service_name: nova
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
index 01b320973..c77fc9ba3 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml
@@ -8,6 +8,7 @@
 ---
 classes:
   - system.linux.system.lowmem
+  - system.linux.system.repo.mcp.openstack
   - service.nfs.server
   - system.mongodb.server.single
   - system.mongodb.server.database.ceilometer
@@ -21,7 +22,6 @@ classes:
   - system.keystone.client.single
   - 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.ceilometer
   - system.keystone.client.service.aodh
@@ -58,6 +58,11 @@ parameters:
       admin_email: ${_param:admin_email}
       openrc_extra:
         volume_device_name: vdc
+      pkgs:
+        - keystone
+        - python-psycopg2
+        - python-mysqldb
+        - python-openstackclient
   glance:
     server:
       storage:
@@ -76,13 +81,6 @@ parameters:
         novncproxy_port: 6080
       vncproxy_url: http://${_param:cluster_vip_address}:6080
       workers: 1
-      pkgs:
-        - nova-api
-        - nova-conductor
-        - nova-consoleauth
-        - nova-novncproxy
-        - nova-scheduler
-        - python-novaclient
   horizon:
     server:
       # yamllint disable-line rule:truthy
diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml
index 8061bb1fe..5edf48c31 100644
--- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_gateway.yml
@@ -7,6 +7,7 @@
 ##############################################################################
 ---
 classes:
+  - system.linux.system.repo.mcp.openstack
   - cluster.mcp-pike-common-noha.openstack_gateway_pdf
 parameters:
   _param:
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 7c6ce90b7..bc9f8fb07 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
@@ -93,17 +93,6 @@ parameters:
     aodh_service_host: ${_param:cluster_local_address}
   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"
-          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"
-          key_id: EC4926EA
-          key_server: keyserver.ubuntu.com
       kernel:
         sysctl:
           net.ipv4.tcp_congestion_control: yeah
-- 
cgit 1.2.3-korg