diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
index 72dcebe..15af706 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml
@@ -3,8 +3,8 @@
 - system.kubernetes.pool.cluster
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client
-- cluster.virtual-mcp11-k8s-calico.infra
-- cluster.virtual-mcp11-k8s-calico.opencontrail.compute
+- cluster.virtual-mcp11-k8s-contrail.infra
+- cluster.virtual-mcp11-k8s-contrail.opencontrail.compute
 parameters:
   _param:
     kubernetes_hyperkube_image: docker-prod-virtual.sandbox.mirantis.net/mirantis/kubernetes/hyperkube-amd64:v1.5.4-5
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
index f7bcd0c..c88d8ed 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml
@@ -4,8 +4,7 @@
 - system.linux.system.repo.docker
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
-- cluster.virtual-mcp11-k8s-calico.kubernetes.compute
-- cluster.virtual-mcp11-k8s-calico.infra
+- cluster.virtual-mcp11-k8s-contrail.kubernetes.compute
 parameters:
   _param:
     keepalived_vip_interface: ens4
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/control.yml
index 4493ceb..a6de5e9 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:
@@ -64,4 +64,4 @@
         engine: k8s
       identity:
         engine: k8s
-        host: none
\ No newline at end of file
+        host: none
diff --git a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
index a880fee..30ec91e 100644
--- a/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
+++ b/classes/cluster/virtual-mcp11-k8s-contrail/opencontrail/init.yml
@@ -11,6 +11,11 @@
     opencontrail_control_node02_address: 172.16.10.111
     opencontrail_control_node03_address: 172.16.10.112
 
+    keystone_admin_password: none
+    opencontrail_stats_password: password
+    keystone_service_token: none
+    openstack_version: mitaka
+
   linux:
     network:
       host:
diff --git a/classes/system b/classes/system
index 62a6c7f..65ae6c9 160000
--- a/classes/system
+++ b/classes/system
@@ -1 +1 @@
-Subproject commit 62a6c7f4a0e1ae9d329b4ad7d40bcaca0ceef2cc
+Subproject commit 65ae6c91bbe72c4b176631588f56c7e918d7fc73