commit 75c2f958c917d44dd62553e87bb2af6d1e347ccc
author Adam Tengler <atengler@mirantis.com> Tue Jul 04 17:37:15 2017 +0000
committer Adam Tengler <atengler@mirantis.com> Tue Jul 04 17:37:57 2017 +0000
tree ef2c15f9e28a84345883fb77f00e7d161263a59a
parent 0963f86c6baffede7f5cfe59fc5e67e55a1c0ba1

Class includes fixed in k8s_ha_contrail and sl_k8s_contrail models

Change-Id: I678ff8513533d5e7920ea7cbbffd148b723d4f1c

classes/cluster/sl_k8s_contrail/kubernetes/compute.yml

diff --git a/classes/cluster/sl_k8s_contrail/kubernetes/compute.yml b/classes/cluster/sl_k8s_contrail/kubernetes/compute.yml
index b6340e5..fb174a5 100644
--- a/classes/cluster/sl_k8s_contrail/kubernetes/compute.yml
+++ b/classes/cluster/sl_k8s_contrail/kubernetes/compute.yml
@@ -3,9 +3,8 @@
 - system.kubernetes.pool.cluster
 - system.salt.minion.cert.k8s_client
 - system.salt.minion.cert.etcd_client
-- cluster.k8s_ha_contrail.infra
-- cluster.k8s_ha_contrail.opencontrail.compute
-- cluster.overrides
+- cluster.sl_k8s_contrail.opencontrail.compute
+- cluster.sl_k8s_contrail
 parameters:
   linux:
     network:

classes/cluster/sl_k8s_contrail/kubernetes/control.yml

diff --git a/classes/cluster/sl_k8s_contrail/kubernetes/control.yml b/classes/cluster/sl_k8s_contrail/kubernetes/control.yml
index 19f9217..71d1948 100644
--- a/classes/cluster/sl_k8s_contrail/kubernetes/control.yml
+++ b/classes/cluster/sl_k8s_contrail/kubernetes/control.yml
@@ -4,8 +4,8 @@
 - system.linux.system.repo.docker
 - system.salt.minion.cert.etcd_server
 - system.kubernetes.master.cluster
-- cluster.k8s_ha_contrail.kubernetes.compute
-- cluster.overrides
+- cluster.sl_k8s_contrail.kubernetes.compute
+- cluster.sl_k8s_contrail
 parameters:
   _param:
     keepalived_vip_interface: vhost0