Switch virtual labs to Salt 2017.7
Change-Id: I2c08014f08cc08ed3cd869adc186974f11c6d313
diff --git a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
index eae43fa..e9e2616 100644
--- a/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/infra/config.yml
@@ -2,7 +2,7 @@
- service.git.client
- system.linux.system.single
- system.linux.system.single.debian
-- system.linux.system.repo_local.mcp.salt
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.openssh.client.lab
- system.salt.master.pkg
diff --git a/classes/cluster/virtual-offline-pike-ovs/init.yml b/classes/cluster/virtual-offline-pike-ovs/init.yml
index 470680c..6e3b1fc 100644
--- a/classes/cluster/virtual-offline-pike-ovs/init.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/init.yml
@@ -4,7 +4,7 @@
- system.heka.log_collector.single
- system.heka.log_collector.output.telegraf
- system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
- system.linux.system.single
- system.rsyslog.client.single
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml
index b5a3e61..cb38f78 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/compute.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
- system.linux.system.repo_local.mcp.apt_mirantis.ceph
- system.linux.network.hosts
- system.nova.compute.cluster
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
index 92963cf..36b8318 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/control.yml
@@ -3,7 +3,7 @@
- system.linux.system.repo_local.mcp.apt_mirantis.glusterfs
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
- system.linux.system.repo_local.mcp.apt_mirantis.ceph
- system.memcached.server.single
- system.rabbitmq.server.cluster
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml
index 5b222ee..94862a8 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/dashboard.yml
@@ -2,7 +2,7 @@
- system.linux.system.repo_local.mcp.apt_mirantis.ubuntu
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
- system.horizon.server.single
- cluster.virtual-offline-pike-ovs
parameters:
diff --git a/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml b/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml
index 6e18bf7..391dd3c 100644
--- a/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml
+++ b/classes/cluster/virtual-offline-pike-ovs/openstack/gateway.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.repo_local.mcp.apt_mirantis.openstack
- system.linux.system.repo_local.mcp.extra
-- system.linux.system.repo_local.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo_local.mcp.apt_mirantis.saltstack
- system.neutron.gateway.cluster
- cluster.virtual-offline-pike-ovs
parameters: