| commit | 47393e458c10a78cb5164a33b22cf6413ec645c3 | [log] [tgz] |
|---|---|---|
| author | Martin Polreich <polreichmartin@gmail.com> | Tue Aug 07 10:57:41 2018 +0200 |
| committer | Martin Polreich <polreichmartin@gmail.com> | Tue Aug 07 10:58:42 2018 +0200 |
| tree | b1bd8e2b87ce4abf9422a09c6c87ba9802d1be58 | |
| parent | 1e32bc4afdcfb75f74170cd33df8326ad680a579 [diff] |
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-contrail-nfv/opencontrail/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml index 1d93eb1..53c4f99 100644 --- a/classes/cluster/virtual-mcp11-contrail-nfv/opencontrail/control.yml +++ b/classes/cluster/virtual-mcp11-contrail-nfv/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/virtual-mcp11-contrail-nfv/openstack/compute.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml index f2f7bcd..465d7d2 100755 --- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/compute.yml +++ b/classes/cluster/virtual-mcp11-contrail-nfv/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/virtual-mcp11-contrail-nfv/openstack/control.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml index b5a4177..0fd9d36 100755 --- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml +++ b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/control.yml
@@ -5,7 +5,7 @@ - system.linux.system.repo.mcp.openstack - system.linux.system.repo.mos10 - 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/virtual-mcp11-contrail-nfv/openstack/dashboard.yml b/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml index 2e24e3b..ffba01d 100755 --- a/classes/cluster/virtual-mcp11-contrail-nfv/openstack/dashboard.yml +++ b/classes/cluster/virtual-mcp11-contrail-nfv/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