Merge "Fix 'galera:master' mapping on all ctl nodes"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
index 1f0e0bc..bafc033 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
@@ -183,6 +183,7 @@
openstack_control_node01:
classes:
- service.galera.master.cluster
+ - service.galera.ssl.master
- service.dogtag.server.cluster.master
params:
mysql_cluster_role: master
@@ -190,6 +191,7 @@
openstack_control_node02:
classes:
- service.galera.slave.cluster
+ - service.galera.ssl.slave
- service.dogtag.server.cluster.slave
params:
mysql_cluster_role: slave
@@ -197,6 +199,7 @@
openstack_control_node03:
classes:
- service.galera.slave.cluster
+ - service.galera.ssl.slave
- service.dogtag.server.cluster.slave
params:
mysql_cluster_role: slave
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
index a0fa510..708b627 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
@@ -35,7 +35,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
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
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
index e22f2b7..363b087 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/infra/config.yml
@@ -140,18 +140,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-mcp11-ovs-ironic-ssl/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/control.yml
index 455c8d9..14db25a 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic-ssl/openstack/control.yml
@@ -32,7 +32,6 @@
- system.haproxy.proxy.listen.openstack.nova-placement
- system.heat.server.cluster
- system.galera.server.cluster
-- service.galera.ssl
- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
- system.galera.server.database.glance
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
index 5789a2b..ce34bee 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/infra/config.yml
@@ -140,18 +140,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-mcp11-ovs-ironic/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
index 96fb246..b6d35fa 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
@@ -27,7 +27,6 @@
- system.haproxy.proxy.listen.openstack.nova-placement
- system.heat.server.cluster
- system.galera.server.cluster
-- service.galera.ssl
- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
- system.galera.server.database.glance