add fixes for k8s with contrail

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