commit 2dcca6d7e108cc18e8ca969613efdf574f4266e6
author Marek Celoud <mceloud@mirantis.com> Wed May 03 18:11:56 2017 +0200
committer Marek Celoud <mceloud@mirantis.com> Wed May 03 18:11:56 2017 +0200
tree c6f21aea6467427c94301df4bcbf1886e44e92cf
parent bd9af0662c189281d77dbe7f8f73cb90fa8c2fe8

add fixes for k8s with contrail

Change-Id: If68bab3e07865f68ebd495db090bef016db55056

classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/compute.yml

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

classes/cluster/virtual-mcp11-k8s-contrail/kubernetes/control.yml

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