diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 3c7c8c2..6a147f1 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -8,7 +8,23 @@
 parameters:
   _param:
     kubernetes_hyperkube_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.6.2-2
-
+  linux:
+    network:
+      interface:
+        ens4:
+          enabled: true
+          type: eth
+          proto: manual
+        vhost0:
+          enabled: true
+          type: eth
+          mtu: 1500
+          address: ${_param:single_address}
+          netmask: '255.255.255.0'
+          pre_up_cmds:
+          - /usr/lib/contrail/if-vhost0
+          use_interfaces:
+          - ens4
   docker:
     host:
       pkgs:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml
index 6f4026f..b223af8 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/compute.yml
@@ -1,9 +1,12 @@
 classes:
+- system.linux.system.repo.mcp.contrail
 - system.opencontrail.compute.cluster
+- system.opencontrail.client.cluster
+- system.opencontrail.client.resource.virtual_router
 parameters:
   _param:
     opencontrail_compute_address: ${_param:single_address}
-    opencontrail_compute_iface: eth1
+    opencontrail_compute_iface: ens4
     opencontrail_compute_gateway: 172.16.10.1
     opencontrail_compute_dns: 8.8.8.8
   opencontrail:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
index 7ca0e79..5657ac9 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
@@ -2,17 +2,17 @@
 - system.linux.system.lowmem
 - system.linux.system.repo.cassandra
 - system.linux.system.repo.mcp.contrail
-#- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.openstack
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.trusty
 #- system.opencontrail.client.resource.edge_router
 - system.rabbitmq.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.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.haproxy.proxy.listen.opencontrail.analytics
 - cluster.virtual-mcp11-k8s-contrail.infra
 parameters:
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
index 30ec91e..cd3445a 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
@@ -15,6 +15,8 @@
     opencontrail_stats_password: password
     keystone_service_token: none
     openstack_version: mitaka
+    openstack_control_address: none
+    keystone_admin_password: none
 
   linux:
     network:
diff --git a/classes/system b/classes/system
index bb777c9..883c626 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit bb777c91389d2d6be986fef3d5e707d9276a7fd0
+Subproject commit 883c6269f791f64dce33d95c502e20c661a6c39c