Few fixes for k8s-ha-contrail-40

Change-Id: If847a721c69bf0e4933c6ef3e1cc14bd5119e9ab
diff --git a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
index c76cc57..2045011 100644
--- a/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
+++ b/classes/cluster/k8s-ha-contrail-40/opencontrail/control.yml
@@ -2,7 +2,7 @@
 - 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.xenial
 - system.opencontrail.client.resource.edge_router
@@ -13,9 +13,11 @@
 - system.opencontrail.client.resource.database_node
 - system.opencontrail.client.resource.analytics_node
 - system.opencontrail.client.resource.global_vrouter_config
+- system.opencontrail.client.resource.k8s_api
 - system.haproxy.proxy.listen.opencontrail.analytics
 - cluster.k8s-ha-contrail-40.infra
 - cluster.k8s-ha-contrail-40.opencontrail
+- cluster.overrides
 
 parameters:
   _param:
@@ -39,6 +41,12 @@
   opencontrail:
     compute:
       enabled: false
+      version: ${_param:opencontrail_version}
+      disable_flow_collection: true
+      interface:
+        dev: ens4
+        address: None
+        mtu: 1500
     common:
       identity:
         host: none