More fixes
diff --git a/classes/cluster/virtual-mcp-allinone/init.yml b/classes/cluster/virtual-mcp-allinone/init.yml
index abca1cd..718b47b 100755
--- a/classes/cluster/virtual-mcp-allinone/init.yml
+++ b/classes/cluster/virtual-mcp-allinone/init.yml
@@ -1,6 +1,7 @@
classes:
- system.linux.system.single
- service.mysql.server.single
+- system.mysql.client
- system.memcached.server.single
- system.rabbitmq.server.single
- cluster.virtual-mcp-allinone.openstack
@@ -18,18 +19,9 @@
enabled: true
type: ovs_bridge
mysql:
- client:
- enabled: true
- server:
- database:
- admin:
- encoding: utf8
- host: localhost
- password: ${_param:mysql_admin_password}
- port: 3306
- user: ${_param:mysql_admin_user}
server:
version: '5.6'
+# override on this level
nova:
compute:
cache:
@@ -42,14 +34,8 @@
members:
- host: 127.0.0.1
port: 11211
- rabbitmq:
+ neutron:
server:
- host:
- 'openstack':
- enabled: true
- user: openstack
- password: ${_param:rabbitmq_openstack_password}
- policies:
- - name: HA
- pattern: '^(?!amq\.).*'
- definition: '{"ha-mode": "all", "message-ttl": 120000}'
+ message_queue:
+ members:
+ - host: ${_param:single_address}
diff --git a/classes/cluster/virtual-mcp-allinone/openstack/init.yml b/classes/cluster/virtual-mcp-allinone/openstack/init.yml
index 04663ba..e56f23d 100755
--- a/classes/cluster/virtual-mcp-allinone/openstack/init.yml
+++ b/classes/cluster/virtual-mcp-allinone/openstack/init.yml
@@ -12,11 +12,11 @@
- system.mysql.client.database.cinder
- system.mysql.client.database.heat
- system.keystone.client.single
-- system.keystone.client.service.nova
+- system.keystone.client.service.nova21
- system.keystone.client.service.nova-placement
- system.glance.control.single
- system.nova.control.single
-- system.neutron.control.single
+- system.neutron.control.openvswitch.single
- system.heat.server.single
- system.nova.compute.single
- service.neutron.gateway.single
@@ -64,66 +64,28 @@
metadata_password: workshop
cluster_vip_address: ${_param:single_address}
cluster_local_address: ${_param:single_address}
+ openstack_database_address: ${_param:single_address}
tenant_address: ${_param:single_address}
heat_domain_admin_password: workshop
horizon_secret_key: workshop
- keystone:
- server:
- tokens:
- engine: fernet
- message_queue:
- virtual_host: openstack
neutron:
server:
- backend:
- engine: ml2
- tenant_network_types: "flat,vxlan"
- mechanism:
- ovs:
- driver: openvswitch
message_queue:
- virtual_host: openstack
+ members: ~
gateway:
- message_queue:
- host: ${_param:single_address}
- metadata:
- host: ${_param:single_address}
- password: workshop
- local_ip: ${_param:single_address}
agent_mode: legacy
nova:
- controller:
- version: ${_param:nova_version}
- metadata:
- password: workshop
- message_queue:
- virtual_host: openstack
compute:
network:
- region: ${_param:openstack_region}
user: neutron
password: ${_param:keystone_neutron_password}
tenant: service
cache:
members: ~
- glance:
- server:
- message_queue:
- virtual_host: openstack
- rabbitmq:
- server:
- host: ~
cinder:
- controller:
- message_queue:
- virtual_host: openstack
volume:
cache:
members: ~
- heat:
- server:
- message_queue:
- virtual_host: openstack
horizon:
server:
secure: False