add fixes for k8s with contrail

Change-Id: If68bab3e07865f68ebd495db090bef016db55056
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