commit a0addcc798f994da1d7fb275f9e73bc90213931e
author Martin Polreich <polreichmartin@gmail.com> Mon Jun 25 11:32:52 2018 +0200
committer Tatyana Leontovich <tleontovich@mirantis.com> Mon Jul 02 23:03:00 2018 +0300
tree a8ba174dde3d62cf7d3df98d3ff96d47c7c9550e
parent c94eb1e9b0f2ac0a855a9fc5b08a0ff8a2eaa9e9

Switch virtual labs to Salt 2017.7

Change-Id: I2c08014f08cc08ed3cd869adc186974f11c6d313

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

diff --git a/classes/cluster/sl-k8s-calico/infra/config.yml b/classes/cluster/sl-k8s-calico/infra/config.yml
index 88cc695..a6c2a55 100644
--- a/classes/cluster/sl-k8s-calico/infra/config.yml
+++ b/classes/cluster/sl-k8s-calico/infra/config.yml
@@ -1,7 +1,6 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
-- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.openssh.client.lab
 - system.salt.master.pkg
 - system.salt.minion.ca.salt_master

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

diff --git a/classes/cluster/sl-k8s-calico/infra/init.yml b/classes/cluster/sl-k8s-calico/infra/init.yml
index 270fec0..01f8053 100644
--- a/classes/cluster/sl-k8s-calico/infra/init.yml
+++ b/classes/cluster/sl-k8s-calico/infra/init.yml
@@ -1,7 +1,7 @@
 classes:
 - system.linux.system.single
 - system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
 - system.openssh.server.team.all
 - system.rsyslog.client.single