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-contrail-ironic/opencontrail/control.yml b/classes/cluster/os-ha-contrail-ironic/opencontrail/control.yml
index 8c9ec86..325eb9d 100644
--- a/classes/cluster/os-ha-contrail-ironic/opencontrail/control.yml
+++ b/classes/cluster/os-ha-contrail-ironic/opencontrail/control.yml
@@ -4,7 +4,7 @@
- system.linux.system.repo.mcp.contrail
- system.linux.system.repo.mcp.openstack
- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.trusty
+- system.linux.system.repo.mcp.apt_mirantis.saltstack
- system.opencontrail.client.resource.edge_router
- system.opencontrail.control.cluster
- system.opencontrail.client.cluster
diff --git a/classes/cluster/os-ha-contrail-ironic/opencontrail/tsn.yml b/classes/cluster/os-ha-contrail-ironic/opencontrail/tsn.yml
index 98924b8..b4d8901 100644
--- a/classes/cluster/os-ha-contrail-ironic/opencontrail/tsn.yml
+++ b/classes/cluster/os-ha-contrail-ironic/opencontrail/tsn.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.system.repo.mcp.contrail
- system.opencontrail.compute.cluster
- system.opencontrail.client.cluster
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/baremetal.yml b/classes/cluster/os-ha-contrail-ironic/openstack/baremetal.yml
index 19ec724..b2563f6 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/baremetal.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/baremetal.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.system.repo.mcp.contrail
- system.opencontrail.client.cluster
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/compute.yml b/classes/cluster/os-ha-contrail-ironic/openstack/compute.yml
index 110d389..899afb7 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/compute.yml
+++ b/classes/cluster/os-ha-contrail-ironic/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.nova.compute.cluster
- system.opencontrail.compute.cluster
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/control.yml b/classes/cluster/os-ha-contrail-ironic/openstack/control.yml
index 47f3f44..8a4ac5f 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/control.yml
+++ b/classes/cluster/os-ha-contrail-ironic/openstack/control.yml
@@ -4,7 +4,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.cluster
- system.rabbitmq.server.vhost.openstack
diff --git a/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml b/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml
index 3a410db..e68e15e 100755
--- a/classes/cluster/os-ha-contrail-ironic/openstack/dashboard.yml
+++ b/classes/cluster/os-ha-contrail-ironic/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.cluster
- system.horizon.server.plugin.contrail
- system.horizon.server.plugin.overrides