Merge "Fix 'galera:master' mapping on all ctl nodes"
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
index 4e3841c..921c49a 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/telemetry.yml
@@ -2,7 +2,7 @@
- system.salt.minion.cert.proxy
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.memcached.server.single
- system.apache.server.single
- system.apache.server.site.gnocchi
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
index 8ad711d..d5c6cce 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/telemetry.yml
@@ -2,7 +2,7 @@
- system.salt.minion.cert.proxy
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.memcached.server.single
- system.apache.server.single
- system.apache.server.site.gnocchi
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
index 34090ce..6c966d0 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/telemetry.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.memcached.server.single
- system.apache.server.single
- system.apache.server.site.gnocchi
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
index 68fdc35..63f26bb 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/init.yml
@@ -44,6 +44,7 @@
openstack_region: RegionOne
admin_email: root@localhost
cluster_public_protocol: http
+ cluster_internal_protocol: http
cluster_public_host: 172.16.10.254
telemetry_public_host: ${_param:openstack_telemetry_address}
neutron_public_protocol: http
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
index 5f6aa32..de77aa0 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/telemetry.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.glusterfs
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.memcached.server.single
- system.apache.server.single
- system.apache.server.site.gnocchi
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
index f442b42..a8d1314 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/init.yml
@@ -47,6 +47,7 @@
telemetry_public_host: ${_param:openstack_telemetry_address}
neutron_public_protocol: http
cluster_public_protocol: http
+ cluster_internal_protocol: http
neutron_control_dvr: False
neutron_tenant_network_types: "flat,vxlan"
neutron_l3_ha: False