commit f7031dd8d2afc8ed16919172e27f6be8cd5f1b16
author Victor Ryzhenkin <vryzhenkin@mirantis.com> Wed Jan 09 02:26:40 2019 +0400
committer Victor Ryzhenkin <vryzhenkin@mirantis.com> Wed Jan 09 02:44:32 2019 +0400
tree f3dfb76d8e08f258dc02f447f197d7808c107061
parent 43e27479c5ff8c6a7242c0fc0c52276dd1fb4011

Add back global init for k8s models

Change-Id: I2c548e2d4d78089ce51e123b50e2aa9641556bdf
Related-PROD: PROD-25976

classes/cluster/k8s-ha-calico/infra/config.yml

diff --git a/classes/cluster/k8s-ha-calico/infra/config.yml b/classes/cluster/k8s-ha-calico/infra/config.yml
index d582161..b3424c3 100644
--- a/classes/cluster/k8s-ha-calico/infra/config.yml
+++ b/classes/cluster/k8s-ha-calico/infra/config.yml
@@ -6,7 +6,7 @@
 - system.salt.minion.cert.k8s_server
 - system.reclass.storage.salt
 - system.reclass.storage.system.kubernetes_control_cluster
-- cluster.k8s-ha-calico.infra
+- cluster.k8s-ha-calico
 parameters:
   _param:
     salt_master_base_environment: prd

classes/cluster/k8s-ha-calico/infra/init.yml

diff --git a/classes/cluster/k8s-ha-calico/infra/init.yml b/classes/cluster/k8s-ha-calico/infra/init.yml
index 26fcf36..8b0efc6 100644
--- a/classes/cluster/k8s-ha-calico/infra/init.yml
+++ b/classes/cluster/k8s-ha-calico/infra/init.yml
@@ -9,8 +9,6 @@
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.linux.system.repo.mcp.apt_mirantis.salt-formulas
 - system.openssh.server.team.all
-- cluster.k8s-ha-calico.kubernetes
-- cluster.overrides
 parameters:
   _param:
     # infra service addresses