diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml b/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
index 788b214..2262899 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/compute.yml
@@ -5,6 +5,8 @@
 - system.nova.compute.cluster
 - system.opencontrail.compute.cluster
 - system.heka.alarm.openstack_compute
+- system.opencontrail.client.cluster
+- system.opencontrail.client.resource.virtual_router
 - service.opencontrail.compute.cluster
 - cluster.virtual-mcp10-contrail
 parameters:
diff --git a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
index 1febe01..4c73c00 100755
--- a/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
+++ b/classes/cluster/virtual-mcp10-contrail/openstack/control.yml
@@ -21,6 +21,11 @@
 - system.ceilometer.server.backend.influxdb
 - system.aodh.server.cluster
 - system.opencontrail.control.cluster
+- system.opencontrail.client.cluster
+- system.opencontrail.client.resource.control_node
+- system.opencontrail.client.resource.config_node
+- system.opencontrail.client.resource.database_node
+- system.opencontrail.client.resource.analytics_node
 - system.heka.ceilometer_collector.single
 - system.galera.server.cluster
 - system.galera.server.database.aodh
diff --git a/classes/system b/classes/system
index baf830e..c964e6e 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit baf830eb4645af839ea9ccbe9eff1a91465f9a5e
+Subproject commit c964e6eef2d5ebc89ba41dac3673d86146cac050