diff --git a/classes/cluster/virtual-mcp11-contrail/infra/config.yml b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
index 950a545..91125e3 100755
--- a/classes/cluster/virtual-mcp11-contrail/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-contrail/infra/config.yml
@@ -13,6 +13,8 @@
 - system.keystone.client.service.aodh
 - system.keystone.client.service.ceilometer
 - system.keystone.client.service.nova21
+- system.keystone.client.service.glare
+- system.keystone.client.service.cinder3
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
diff --git a/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
index 8831313..0606f02 100644
--- a/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/opencontrail/control.yml
@@ -14,6 +14,7 @@
 - system.opencontrail.client.resource.database_node
 - system.opencontrail.client.resource.analytics_node
 - system.haproxy.proxy.listen.opencontrail.analytics
+- cluster.virtual-mcp11-contrail
 parameters:
   _param:
     keepalived_vip_interface: eth1
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
index c35519e..e2c013d 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/control.yml
@@ -9,6 +9,7 @@
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
+- system.keystone.server.wsgi
 - system.keystone.server.cluster
 - system.keystone.server.storage.glusterfs
 - system.glance.control.cluster
diff --git a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
index 96d9b2d..75d679f 100755
--- a/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-contrail/openstack/init.yml
@@ -59,6 +59,7 @@
     keystone_neutron_password: workshop
     keystone_nova_password: workshop
     ceilometer_secret_key: workshop
+    metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:openstack_control_address}
diff --git a/classes/cluster/virtual-mcp11-dvr/infra/config.yml b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
index bbecbb8..caed62a 100644
--- a/classes/cluster/virtual-mcp11-dvr/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-dvr/infra/config.yml
@@ -12,6 +12,8 @@
 - system.keystone.client.single
 - system.keystone.client.service.ceilometer
 - system.keystone.client.service.nova21
+- system.keystone.client.service.glare
+- system.keystone.client.service.cinder3
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
diff --git a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
index 77218fd..dc1e84c 100644
--- a/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-dvr/openstack/control.yml
@@ -8,6 +8,7 @@
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
+- system.keystone.server.wsgi
 - system.keystone.server.cluster
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.glance
diff --git a/classes/cluster/virtual-mcp11-ovs/infra/config.yml b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
index 1e10f4a..3cc71eb 100644
--- a/classes/cluster/virtual-mcp11-ovs/infra/config.yml
+++ b/classes/cluster/virtual-mcp11-ovs/infra/config.yml
@@ -12,6 +12,8 @@
 - system.keystone.client.single
 - system.keystone.client.service.ceilometer
 - system.keystone.client.service.nova21
+- system.keystone.client.service.glare
+- system.keystone.client.service.cinder3
 - system.mysql.client.single
 - system.reclass.storage.system.openstack_control_cluster
 - system.reclass.storage.system.openstack_compute_multi
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
index 922f5aa..ecb3f95 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/control.yml
@@ -8,6 +8,7 @@
 - system.memcached.server.single
 - system.rabbitmq.server.cluster
 - system.rabbitmq.server.vhost.openstack
+- system.keystone.server.wsgi
 - system.keystone.server.cluster
 - system.glusterfs.client.cluster
 - system.glusterfs.client.volume.glance
diff --git a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
index 2676ba1..433f8a3 100644
--- a/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-ovs/openstack/init.yml
@@ -72,6 +72,7 @@
     keystone_neutron_password: workshop
     keystone_nova_password: workshop
     ceilometer_secret_key: workshop
+    metadata_password: workshop
     horizon_version: ${_param:openstack_version}
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}