Switch to mirror.mirantis.com for deployment
Also aio model is switched to use testing, infra class and openstack
is switched to allow overriding apt_mk_version
Change-Id: Idce36c0551b0013af39bb9627a33c7a9d4634155
Related-Prod: https://mirantis.jira.com/browse/PROD-18517
diff --git a/classes/cluster/virtual-mcp11-aio/infra/init.yml b/classes/cluster/virtual-mcp11-aio/infra/init.yml
index d00a830..c74a1ac 100644
--- a/classes/cluster/virtual-mcp11-aio/infra/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/infra/init.yml
@@ -1,6 +1,6 @@
parameters:
_param:
- apt_mk_version: stable
+ apt_mk_version: testing
linux_system_purge_repos: false
salt:
minion:
diff --git a/classes/cluster/virtual-mcp11-aio/init.yml b/classes/cluster/virtual-mcp11-aio/init.yml
index a51ec65..0046bcd 100755
--- a/classes/cluster/virtual-mcp11-aio/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/init.yml
@@ -12,8 +12,8 @@
- system.mysql.client
- system.memcached.server.single
- system.rabbitmq.server.single
-- cluster.virtual-mcp11-aio.infra
- cluster.virtual-mcp11-aio.openstack
+- cluster.virtual-mcp11-aio.infra
- cluster.overrides
parameters:
_param:
@@ -49,15 +49,6 @@
enabled: true
# r00tme
password: $6$9ojWyyN.$26Vj46JtCUL6C7XBQ8RmQTZLwo8/8SkqTRElXh0X2YBLrt7E/aVe2AYQ5gguYUwUknZNOSn5q7M9M3Jyf2gof/
- repo:
- linux_system_repo:
- source: ${_param:linux_system_repo}
- architectures: amd64
- clean_file: true
- pin:
- - pin: ${_param:linux_system_repo_pin}
- priority: ${_param:linux_system_repo_priority}
- package: '*'
network:
bridge: openvswitch
interface:
diff --git a/classes/cluster/virtual-mcp11-aio/openstack/init.yml b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
index 086346e..1fd8bdf 100755
--- a/classes/cluster/virtual-mcp11-aio/openstack/init.yml
+++ b/classes/cluster/virtual-mcp11-aio/openstack/init.yml
@@ -2,7 +2,7 @@
- system.salt.minion.cert.mysql.server
- system.salt.minion.cert.rabbitmq_server
- system.linux.system.lowmem
-- system.linux.system.repo.mcp.openstack
+- system.linux.system.repo.mcp.mirror.v1.openstack
- system.linux.system.repo.mcp.extra
- system.linux.storage.loopback
- service.rabbitmq.server.ssl
@@ -116,9 +116,6 @@
rndc_key_file: /etc/designate/rndc.key
designate_quota_zones: 40
designate_worker_enabled: true
- linux_system_repo: deb [arch=amd64] http://mirror.fuel-infra.org/mcp-repos/${_param:openstack_version}/xenial ${_param:openstack_version} main
- linux_system_repo_pin: release a=${_param:openstack_version}
- linux_system_repo_priority: 1200
openstack_public_neutron_subnet_gateway: 192.168.130.1
openstack_public_neutron_subnet_cidr: 192.168.130.0/24
openstack_public_neutron_subnet_allocation_start: 192.168.130.10