Remove upstream Salt repos from models and replace with mcp repos
Fixes: PROD-22008 (PROD:22008)
Change-Id: I1537c55fef23d732952b944dc6f2dda3e37d02df
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/compute.yml b/classes/cluster/os-ha-ovs-pike/openstack/compute.yml
index b1ab980..62cd8a5 100644
--- a/classes/cluster/os-ha-ovs-pike/openstack/compute.yml
+++ b/classes/cluster/os-ha-ovs-pike/openstack/compute.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- 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/os-ha-ovs-pike/openstack/control.yml b/classes/cluster/os-ha-ovs-pike/openstack/control.yml
index 20d2497..19d699b 100644
--- a/classes/cluster/os-ha-ovs-pike/openstack/control.yml
+++ b/classes/cluster/os-ha-ovs-pike/openstack/control.yml
@@ -4,7 +4,7 @@
- system.linux.system.repo.glusterfs
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.linux.storage.loopback
- system.memcached.server.single
- system.rabbitmq.server.cluster
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml b/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml
index a6531c0..55d1050 100644
--- a/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-ovs-pike/openstack/dashboard.yml
@@ -2,7 +2,7 @@
- system.linux.system.repo.mcp.apt_mirantis.ubuntu
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.horizon.server.single
- cluster.os-ha-ovs-pike
parameters:
diff --git a/classes/cluster/os-ha-ovs-pike/openstack/gateway.yml b/classes/cluster/os-ha-ovs-pike/openstack/gateway.yml
index 58201bc..39e2009 100644
--- a/classes/cluster/os-ha-ovs-pike/openstack/gateway.yml
+++ b/classes/cluster/os-ha-ovs-pike/openstack/gateway.yml
@@ -1,7 +1,7 @@
classes:
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.neutron.gateway.cluster
- cluster.os-ha-ovs-pike
parameters: