Aptly - Switch 3p trusty mirrors source to mirror.mirantis.com
Change-Id: I23944ece453d117ce8ced9264e75fcc351505e8d
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
index 41f7e0c..57c669f 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/cassandra.yml
@@ -1,12 +1,14 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_trusty_cassandra_source: http://apt.mirantis.com/trusty/cassandra/
- mirror_mirantis_openstack_trusty_cassandra_distribution: ${_param:apt_mk_version}
- mirror_mirantis_openstack_trusty_cassandra_components: 21x
- mirror_mirantis_openstack_trusty_cassandra_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_trusty_cassandra_source: http://mirror.mirantis.com/${_param:apt_mk_version}/cassandra/trusty/
+ mirror_mirantis_openstack_trusty_cassandra_distribution: 21x
+ mirror_mirantis_openstack_trusty_cassandra_components: main
mirror_mirantis_openstack_trusty_cassandra_gpgkeys:
- - A76882D3
+ - A278B781FE4B2BDA
+ - F758CE318D77295D
+ - 2B5C1B00
+ - 0353B12C
aptly:
server:
mirror:
@@ -15,9 +17,8 @@
distribution: ${_param:mirror_mirantis_openstack_trusty_cassandra_distribution}
components: ${_param:mirror_mirantis_openstack_trusty_cassandra_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_trusty_cassandra_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_trusty_cassandra_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_trusty_cassandra_components}
+ component: 21x
distributions:
- ubuntu-trusty/cassandra/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
index 197e58c..7e6fa70 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/grafana.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_trusty_grafana_source: http://apt.mirantis.com/trusty/grafana/
- mirror_mirantis_openstack_trusty_grafana_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_trusty_grafana_source: http://mirror.mirantis.com/${_param:apt_mk_version}/grafana/trusty/
+ mirror_mirantis_openstack_trusty_grafana_distribution: jessie
mirror_mirantis_openstack_trusty_grafana_components: main
- mirror_mirantis_openstack_trusty_grafana_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_trusty_grafana_gpgkeys:
- - A76882D3
+ - D59097AB
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_trusty_grafana_distribution}
components: ${_param:mirror_mirantis_openstack_trusty_grafana_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_trusty_grafana_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_trusty_grafana_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_trusty_grafana_components}
+ component: main
distributions:
- ubuntu-trusty/grafana/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
index 19b002a..62972a2 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2016-3.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_trusty_saltstack_2016_3_source: http://apt.mirantis.com/trusty/salt/2016.3/
- mirror_mirantis_openstack_trusty_saltstack_2016_3_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_trusty_saltstack_2016_3_source: http://mirror.mirantis.com/${_param:apt_mk_version}/saltstack-2016.3/trusty/
+ mirror_mirantis_openstack_trusty_saltstack_2016_3_distribution: trusty
mirror_mirantis_openstack_trusty_saltstack_2016_3_components: main
- mirror_mirantis_openstack_trusty_saltstack_2016_3_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_trusty_saltstack_2016_3_gpgkeys:
- - A76882D3
+ - DE57BFBE
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_distribution}
components: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_trusty_saltstack_2016_3_components}
+ component: main
distributions:
- ubuntu-trusty/salt/2016.3/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
index 703d0bf..ad1ffcf 100644
--- a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/saltstack/salt-2017-7.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_trusty_saltstack_2017_7_source: http://apt.mirantis.com/trusty/salt/2017.7/
- mirror_mirantis_openstack_trusty_saltstack_2017_7_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_trusty_saltstack_2017_7_source: http://mirror.mirantis.com/${_param:apt_mk_version}/saltstack-2017.7/trusty/
+ mirror_mirantis_openstack_trusty_saltstack_2017_7_distribution: trusty
mirror_mirantis_openstack_trusty_saltstack_2017_7_components: main
- mirror_mirantis_openstack_trusty_saltstack_2017_7_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_trusty_saltstack_2017_7_gpgkeys:
- - A76882D3
+ - DE57BFBE
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_distribution}
components: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_trusty_saltstack_2017_7_components}
+ component: main
distributions:
- - ubuntu-trusty/salt/2017.7/${_param:apt_mk_version}
\ No newline at end of file
+ - ubuntu-trusty/salt/2017.7/${_param:apt_mk_version}