Switch virtual labs to Salt 2017.7
Change-Id: I2c08014f08cc08ed3cd869adc186974f11c6d313
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
index 006d477..2e4953e 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/infra/config.yml
@@ -2,7 +2,7 @@
- service.git.client
- system.linux.system.single
- system.linux.system.single.debian
-- system.linux.system.repo.mcp.salt
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.openssh.client.lab
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/compute.yml
index 12e9166..169f83c 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/compute.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.linux.network.hosts
- system.nova.compute.cluster
- system.neutron.compute.cluster
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml
index bd910d0..42b8b57 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/control.yml
@@ -3,7 +3,7 @@
- system.linux.system.repo.mcp.apt_mirantis.glusterfs
- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.memcached.server.single
- system.rabbitmq.server.cluster
- system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/dashboard.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/dashboard.yml
index 50e37af..870f6e4 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/dashboard.yml
@@ -2,7 +2,7 @@
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.horizon.server.single
- cluster.virtual-mcp-pike-ovs-ceph
parameters:
diff --git a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/gateway.yml
index 2c6b151..f9d8c6a 100644
--- a/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-ovs-ceph/openstack/gateway.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.repo.mcp.apt_mirantis.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.mcp.apt_mirantis.saltstack_2016_3
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.neutron.gateway.cluster
- cluster.virtual-mcp-pike-ovs-ceph
parameters: