Remove upstream Salt repos from models and replace with mcp repos
Fixes: PROD-22008 (PROD:22008)
Change-Id: I1537c55fef23d732952b944dc6f2dda3e37d02df
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/baremetal.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/baremetal.yml
index b361ff2..6de0f8e 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/baremetal.yml
+++ b/classes/cluster/virtual-mcp11-ovs-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.ironic.api.cluster # deploy only api (heartbeat and lookup endpoints are open)
- system.ironic.conductor.cluster
- system.ironic.tftpd_hpa
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/compute.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/compute.yml
index 4b053a8..21f9bab 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/compute.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/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/virtual-mcp11-ovs-ironic/openstack/control.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
index c217e9e..96fb246 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/control.yml
@@ -3,7 +3,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.salt.minion.cert.mysql.server
- system.salt.minion.cert.rabbitmq_server
- system.memcached.server.single
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/dashboard.yml
index b4994ec..cacf94e 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/dashboard.yml
+++ b/classes/cluster/virtual-mcp11-ovs-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.single
- cluster.virtual-mcp11-ovs-ironic
parameters:
diff --git a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/gateway.yml b/classes/cluster/virtual-mcp11-ovs-ironic/openstack/gateway.yml
index f5d851e..2bfe32c 100644
--- a/classes/cluster/virtual-mcp11-ovs-ironic/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp11-ovs-ironic/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.virtual-mcp11-ovs-ironic
parameters: