Fix 'galera:master' mapping on all ctl nodes
'galera:master' pillar must be present only on ctl01,
but the class 'service.galera.ssl' provides this pillar
on all ctl nodes.
Switch to separate 'service.galera.ssl.{master/slave}'
classes for ctl01 and other nodes.
Change-Id: Ib2edaab3bdfbedc161966bfb02523ab9f5d1fff2
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
index 3cb9888..0843311 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/infra/config.yml
@@ -174,18 +174,21 @@
openstack_control_node01:
classes:
- service.galera.master.cluster
+ - service.galera.ssl.master
params:
mysql_cluster_role: master
linux_system_codename: xenial
openstack_control_node02:
classes:
- service.galera.slave.cluster
+ - service.galera.ssl.slave
params:
mysql_cluster_role: slave
linux_system_codename: xenial
openstack_control_node03:
classes:
- service.galera.slave.cluster
+ - service.galera.ssl.slave
params:
mysql_cluster_role: slave
linux_system_codename: xenial
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index dd0e060..7b750a0 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -34,7 +34,6 @@
- system.heat.server.cluster
- system.designate.server.cluster
- system.galera.server.cluster
-- service.galera.ssl
- system.apache.server.ssl
- system.nginx.server.proxy.ssl
- system.galera.server.database.cinder