Revert "Model virtual-mcp11-aio, uses None over List field."
This reverts commit 836c12ce2e4ce9ea7744a8cade24deb78d9ca5ae.
Change-Id: Id620cf85834da839e9c6333e9d5af8c090da358e
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 4b01810..0881c16 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -6,7 +6,7 @@
- system.rabbitmq.server.vhost.openstack
- system.keystone.server.wsgi
- system.keystone.server.single
-- service.galera.master.single
+- service.galera.master.cluster
- system.galera.server.database.cinder
- system.galera.server.database.designate
- system.galera.server.database.glance
@@ -28,7 +28,7 @@
- service.neutron.gateway.single
- system.cinder.control.single
- system.cinder.control.backend.lvm
-- service.cinder.volume.local
+- service.cinder.volume.single
- system.cinder.volume.backend.lvm
- system.horizon.server.single
- system.bind.server.single
@@ -123,10 +123,9 @@
openstack_public_neutron_subnet_allocation_end: 192.168.130.254
barbican_simple_crypto_kek: YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoxMjM0NTY=
barbican_integration_enabled: False
- openstack_message_queue_node01_address: ${_param:single_address}
galera:
master:
- members: []
+ members: ~
innodb_buffer_pool_size: 1024M
max_connections: 1000
slave:
@@ -142,7 +141,7 @@
neutron:
server:
message_queue:
- members: []
+ members: ~
gateway:
agent_mode: dvr_snat
dvr: True
@@ -156,7 +155,7 @@
password: ${_param:keystone_neutron_password}
tenant: service
cache:
- members: []
+ members: ~
controller:
barbican:
enabled: ${_param:barbican_integration_enabled}
@@ -167,7 +166,7 @@
enabled: ${_param:barbican_integration_enabled}
volume:
cache:
- members: []
+ members: ~
horizon:
server:
secure: False