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/infra/config.yml

diff --git a/classes/cluster/sl_k8s_contrail/infra/config.yml b/classes/cluster/sl_k8s_contrail/infra/config.yml
index 49029cd..21a5cac 100644
--- a/classes/cluster/sl_k8s_contrail/infra/config.yml
+++ b/classes/cluster/sl_k8s_contrail/infra/config.yml
@@ -8,7 +8,7 @@
 - system.salt.minion.cert.k8s_server
 - system.reclass.storage.system.kubernetes_control_cluster
 - system.reclass.storage.system.opencontrail_control_cluster
-- cluster.k8s_ha_contrail
+- cluster.sl_k8s_contrail
 parameters:
   _param:
     salt_master_base_environment: prd

classes/cluster/sl_k8s_contrail/infra/init.yml

diff --git a/classes/cluster/sl_k8s_contrail/infra/init.yml b/classes/cluster/sl_k8s_contrail/infra/init.yml
index d5009dc..92f6893 100644
--- a/classes/cluster/sl_k8s_contrail/infra/init.yml
+++ b/classes/cluster/sl_k8s_contrail/infra/init.yml
@@ -13,8 +13,8 @@
     infra_config_address: 172.16.10.100
     infra_config_deploy_address: 192.168.10.100
 
-    cluster_domain: k8s_ha_contrail.local
-    cluster_name: k8s_ha_contrail
+    cluster_domain: sl_k8s_contrail.local
+    cluster_name: sl_k8s_contrail
     apt_mk_version: nightly
   linux:
     network: