Switch virtual labs to Salt 2017.7
Change-Id: I2c08014f08cc08ed3cd869adc186974f11c6d313
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
index 9b5b609..63377bb 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/infra/config.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/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.openstack
- system.openssh.client.lab
- system.salt.master.pkg
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
index ea2affc..95ecbd3 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/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.linux.storage.loopback
- system.cinder.volume.single
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
index 98bdc23..eefbe5c 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/control.yml
@@ -6,7 +6,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
- service.rabbitmq.server.ssl
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/dashboard.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/dashboard.yml
index c1f597b..c7088fa 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/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-dvr-ssl-barbican
parameters:
diff --git a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/gateway.yml b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/gateway.yml
index 303ff44..bd11324 100644
--- a/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-pike-dvr-ssl-barbican/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.linux.network.interface.single_ovs_dvr
- system.neutron.gateway.cluster
- cluster.virtual-mcp-pike-dvr-ssl-barbican