Merge "Enable cinder in virtual-mcp-pike-dvr/ovs"
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
index deeb36d..cba52fd 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/compute.yml
@@ -5,6 +5,9 @@
- system.linux.network.hosts
- system.nova.compute.cluster
- system.neutron.compute.cluster
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
+- system.linux.storage.loopback
- system.ceilometer.client.nova_compute
- system.ceilometer.agent.cluster
- system.ceilometer.agent.polling.default
@@ -17,6 +20,7 @@
external_interface: ens6
interface_mtu: 1500
linux_system_codename: xenial
+ loopback_device_size: 20
nova:
compute:
vncproxy_url: http://${_param:cluster_vip_address}:6080
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
index 62e537e..3211628 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
@@ -21,6 +21,7 @@
- system.nova.control.cluster
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
+- system.cinder.control.backend.lvm
- system.heat.server.cluster
- system.designate.server.cluster
- system.galera.server.cluster
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
index a7817f4..c727f7f 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/compute.yml
@@ -5,6 +5,9 @@
- system.linux.network.hosts
- system.nova.compute.cluster
- system.neutron.compute.cluster
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
+- system.linux.storage.loopback
- system.ceilometer.agent.cluster
- system.ceilometer.agent.polling.default
- cluster.virtual-mcp-pike-ovs
@@ -15,6 +18,7 @@
external_interface: ens6
interface_mtu: 1500
linux_system_codename: xenial
+ loopback_device_size: 20
neutron:
compute:
bgp_vpn:
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index 6402bb9..1d044c0 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -21,6 +21,7 @@
- system.nova.control.cluster
- system.neutron.control.openvswitch.cluster
- system.cinder.control.cluster
+- system.cinder.control.backend.lvm
- system.heat.server.cluster
- system.designate.server.cluster
- system.designate.server.backend.bind