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-aio-contrail/openstack/compute.yml b/classes/cluster/os-aio-contrail/openstack/compute.yml
index 9cff45b..9b4c00f 100755
--- a/classes/cluster/os-aio-contrail/openstack/compute.yml
+++ b/classes/cluster/os-aio-contrail/openstack/compute.yml
@@ -2,7 +2,7 @@
- system.linux.system.repo.mcp.contrail
- 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.opencontrail.compute.cluster
- system.opencontrail.client.cluster
diff --git a/classes/cluster/os-aio-contrail/openstack/control.yml b/classes/cluster/os-aio-contrail/openstack/control.yml
index c1d42eb..70d4058 100755
--- a/classes/cluster/os-aio-contrail/openstack/control.yml
+++ b/classes/cluster/os-aio-contrail/openstack/control.yml
@@ -3,7 +3,7 @@
- system.linux.system.repo.mcp.contrail
- 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.memcached.server.single
- system.rabbitmq.server.single
- system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/os-aio-contrail/openstack/dashboard.yml b/classes/cluster/os-aio-contrail/openstack/dashboard.yml
index a45f059..f6f8adc 100755
--- a/classes/cluster/os-aio-contrail/openstack/dashboard.yml
+++ b/classes/cluster/os-aio-contrail/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
- system.horizon.server.plugin.contrail
- system.horizon.server.plugin.overrides