diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
index 16731e3..52c6ade 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
@@ -4,14 +4,14 @@
 - system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
 - system.linux.network.hosts
 - system.linux.storage.loopback
+- system.cinder.volume.single
+- system.cinder.volume.backend.lvm
 - system.nova.compute.cluster
 - system.neutron.compute.cluster
 - system.ceilometer.client.nova_compute
 - system.ceilometer.agent.cluster
 - system.ceilometer.agent.polling.default
 - system.linux.network.interface.single_ovs_dvr
-- service.cinder.volume.single
-- system.cinder.volume.backend.lvm
 - cluster.virtual-mcp-pike-dvr-ssl-barbican
 parameters:
   _param:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
index cb8a506..98bdc23 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
@@ -30,6 +30,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