Switch virtual labs to Salt 2017.7

Change-Id: I2c08014f08cc08ed3cd869adc186974f11c6d313
diff --git a/classes/cluster/k8s-aio-contrail/infra/config.yml b/classes/cluster/k8s-aio-contrail/infra/config.yml
index 71426ac..aff1246 100644
--- a/classes/cluster/k8s-aio-contrail/infra/config.yml
+++ b/classes/cluster/k8s-aio-contrail/infra/config.yml
@@ -1,6 +1,6 @@
 classes:
 - system.linux.system.repo.mcp.apt_mirantis.ubuntu
-- 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
diff --git a/classes/cluster/k8s-aio-contrail/infra/init.yml b/classes/cluster/k8s-aio-contrail/infra/init.yml
index 94bfd0d..def45c2 100644
--- a/classes/cluster/k8s-aio-contrail/infra/init.yml
+++ b/classes/cluster/k8s-aio-contrail/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