From 3c7e4c3773face367cdf0988cccfc2dfd68f55ab Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Fri, 23 Jun 2017 17:44:33 +0400
Subject: Remove redundant services from noha scenario

Change-Id: I445f6ac802fbf1b382b18bcb4306eb5538cb1867
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---
 .../virtual-mcp-ocata-ovs/openstack/control.yml    | 50 +++++++++++++---------
 1 file changed, 30 insertions(+), 20 deletions(-)

(limited to 'mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml')

diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
index 65fc1e474..8f63000aa 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
@@ -3,30 +3,29 @@ classes:
 - system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
-- system.ceilometer.client
 - system.memcached.server.single
-- system.rabbitmq.server.cluster
+- system.rabbitmq.server.single
 - system.rabbitmq.server.vhost.openstack
 - system.keystone.server.wsgi
-- system.keystone.server.cluster
-- system.glance.control.cluster
-- system.nova.control.cluster
-- system.neutron.control.openvswitch.cluster
-- system.cinder.control.cluster
-- system.heat.server.cluster
-- system.galera.server.cluster
-- system.galera.server.database.aodh
-- system.galera.server.database.ceilometer
+- system.keystone.server.single
+- 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.glance.control.single
+- system.nova.control.single
+- system.neutron.control.openvswitch.single
+- system.cinder.control.single
+- system.heat.server.single
+- service.mysql.server.single
 - system.galera.server.database.cinder
 - system.galera.server.database.glance
 - system.galera.server.database.grafana
 - system.galera.server.database.heat
 - system.galera.server.database.keystone
 - system.galera.server.database.nova
-- system.haproxy.proxy.listen.openstack.nova-placement
-- system.ceilometer.server.cluster
-- system.aodh.server.cluster
-- system.horizon.server.cluster
+- system.horizon.server.single
 - cluster.virtual-mcp-ocata-ovs
 parameters:
   _param:
@@ -46,14 +45,20 @@ parameters:
           proto: static
           address: ${_param:single_address}
           netmask: 255.255.255.0
-  keepalived:
-    cluster:
-      instance:
-        VIP:
-          virtual_router_id: 150
   keystone:
     server:
       admin_email: ${_param:admin_email}
+      pkgs:
+      - keystone
+      - python-keystone
+      - python-keystoneclient
+      - python-psycopg2
+      - python-mysqldb
+      - python-six
+      - python-memcache
+      - python-openstackclient
+      - gettext-base
+      - python-pycadf
   glance:
     server:
       storage:
@@ -72,3 +77,8 @@ parameters:
         novncproxy_port: 6080
       vncproxy_url: http://${_param:cluster_vip_address}:6080
       workers: 1
+  mysql:
+    server:
+      version: '5.7'
+      bind:
+        address: ${_param:cluster_local_address}
-- 
cgit 1.2.3-korg