AIO ovs
Change-Id: Iba7458af9fddae62946bd5d1ab9f5b1575f3b670
diff --git a/classes/cluster/os_aio_ovs/openstack/control.yml b/classes/cluster/os_aio_ovs/openstack/control.yml
index 4c474c1..38ed2ba 100644
--- a/classes/cluster/os_aio_ovs/openstack/control.yml
+++ b/classes/cluster/os_aio_ovs/openstack/control.yml
@@ -5,22 +5,22 @@
- system.linux.system.repo.mcp.extra
- system.linux.system.repo.saltstack.xenial
- 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.glusterfs.client.cluster
-- system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
-- system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
-- system.glusterfs.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.keystone.server.single
+# - system.glusterfs.client.cluster
+# - system.glusterfs.client.volume.glance
+# - system.glusterfs.client.volume.keystone
+# - system.glusterfs.server.volume.glance
+# - system.glusterfs.server.volume.keystone
+# - system.glusterfs.server.cluster
+- system.glance.control.single
+- system.nova.control.single
+- system.neutron.control.openvswitch.single
+- system.cinder.control.single
+- system.heat.server.single
+#- system.galera.server.cluster
- system.galera.server.database.ceilometer
- system.galera.server.database.cinder
- system.galera.server.database.glance
@@ -30,8 +30,25 @@
- cluster.os_aio_ovs
parameters:
_param:
- keepalived_vip_interface: ens4
- keepalived_openstack_telemetry_vip_interface: ens4
+ galera_server_cluster_name: galeracluster
+ galera_server_bind_address: ${_param:cluster_local_address}
+ galera_server_bind_port: 3306
+ galera_server_admin_user: root
+ galera:
+ master:
+ enabled: true
+ name: ${_param:galera_server_cluster_name}
+ bind:
+ address: ${_param:galera_server_bind_address}
+ port: ${_param:galera_server_bind_port}
+ maintenance_password: ${_param:galera_server_maintenance_password}
+ admin:
+ user: ${_param:galera_server_admin_user}
+ password: ${_param:galera_server_admin_password}
+ members:
+ - host: ${_param:openstack_control_node01_address}
+ port: 4567
+##################
linux:
system:
package:
@@ -45,11 +62,6 @@
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}
@@ -83,9 +95,9 @@
password: ${_param:metadata_password}
bind:
private_address: ${_param:cluster_local_address}
- public_address: ${_param:cluster_vip_address}
+ public_address: ${_param:openstack_control_node01_address}
novncproxy_port: 6080
- vncproxy_url: http://${_param:cluster_vip_address}:6080
+ vncproxy_url: http://${_param:openstack_control_node01_address}:6080
workers: 1
notification:
driver: messagingv2