diff --git a/classes/cluster/os-ha-contrail-40/openstack/control.yml b/classes/cluster/os-ha-contrail-40/openstack/control.yml
index d5105fd..424e2bf 100644
--- a/classes/cluster/os-ha-contrail-40/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail-40/openstack/control.yml
@@ -11,11 +11,9 @@
 - system.keystone.server.wsgi
 - system.keystone.server.cluster
 - system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
 - system.glusterfs.server.cluster
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
 - system.glance.control.cluster
 - system.nova.control.cluster
 - system.neutron.control.opencontrail.cluster
diff --git a/classes/cluster/os-ha-contrail/openstack/control.yml b/classes/cluster/os-ha-contrail/openstack/control.yml
index 7aea4e5..51bf18d 100755
--- a/classes/cluster/os-ha-contrail/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail/openstack/control.yml
@@ -11,11 +11,9 @@
 - system.keystone.server.wsgi
 - system.keystone.server.cluster
 - system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
 - system.glusterfs.server.cluster
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
 - system.glance.control.cluster
 - system.nova.control.cluster
 - system.neutron.control.opencontrail.cluster
diff --git a/classes/cluster/sl-os-contrail/openstack/control.yml b/classes/cluster/sl-os-contrail/openstack/control.yml
index cce2588..bfeb04a 100755
--- a/classes/cluster/sl-os-contrail/openstack/control.yml
+++ b/classes/cluster/sl-os-contrail/openstack/control.yml
@@ -11,11 +11,9 @@
 - system.keystone.server.wsgi
 - system.keystone.server.cluster
 - system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
 - system.glusterfs.server.cluster
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
 - system.glance.control.cluster
 - system.nova.control.cluster
 - system.haproxy.proxy.listen.openstack.nova-placement
diff --git a/classes/cluster/sl-os-ovs/openstack/control.yml b/classes/cluster/sl-os-ovs/openstack/control.yml
index b5746f3..507b315 100644
--- a/classes/cluster/sl-os-ovs/openstack/control.yml
+++ b/classes/cluster/sl-os-ovs/openstack/control.yml
@@ -11,9 +11,7 @@
 - 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
diff --git a/classes/cluster/sl-pike-dvr/openstack/control.yml b/classes/cluster/sl-pike-dvr/openstack/control.yml
index d4daf0d..f0ac140 100644
--- a/classes/cluster/sl-pike-dvr/openstack/control.yml
+++ b/classes/cluster/sl-pike-dvr/openstack/control.yml
@@ -11,9 +11,7 @@
 - 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
diff --git a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
index fc50e87..c890a9d 100644
--- a/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-dvr-trusty/openstack/control.yml
@@ -12,9 +12,7 @@
 - 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
@@ -158,4 +156,4 @@
       quota:
         zones: ${_param:designate_quota_zones}
     worker:
-      enabled: ${_param:designate_worker_enabled}
\ No newline at end of file
+      enabled: ${_param:designate_worker_enabled}
diff --git a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
index e0ba2ce..1b21c5f 100644
--- a/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-mitaka-ovs-trusty/openstack/control.yml
@@ -12,9 +12,7 @@
 - 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.heka.ceilometer_collector.single
@@ -154,4 +152,4 @@
       quota:
         zones: ${_param:designate_quota_zones}
     worker:
-      enabled: ${_param:designate_worker_enabled}
\ No newline at end of file
+      enabled: ${_param:designate_worker_enabled}
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 708b627..958e72d 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
@@ -23,9 +23,7 @@
 - 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
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
index 7b750a0..4d44545 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl/openstack/control.yml
@@ -22,9 +22,7 @@
 - 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
diff --git a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
index 53b8c95..3099dc2 100644
--- a/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr/openstack/control.yml
@@ -12,9 +12,7 @@
 - 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.volume.backup
 - system.glusterfs.server.cluster
 - system.glance.control.cluster
diff --git a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
index fc73a24..217fa17 100644
--- a/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs/openstack/control.yml
@@ -12,9 +12,7 @@
 - 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.volume.backup
 - system.glusterfs.server.cluster
 - system.glance.control.cluster
diff --git a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
index 5c41cab..e8b5cd4 100644
--- a/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs-dpdk/openstack/control.yml
@@ -12,9 +12,7 @@
 - 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.volume.backup
 - system.glusterfs.server.cluster
 - system.glusterfs.server.volume.aptly
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
index e7d4084..5fdb7da 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
@@ -12,9 +12,7 @@
 - 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
diff --git a/classes/cluster/virtual-offline-ssl/openstack/control.yml b/classes/cluster/virtual-offline-ssl/openstack/control.yml
index 1889149..3646709 100644
--- a/classes/cluster/virtual-offline-ssl/openstack/control.yml
+++ b/classes/cluster/virtual-offline-ssl/openstack/control.yml
@@ -21,9 +21,7 @@
 - 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