Merge "moved release repositories to mirror.mirantis.com"
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml
index 507ed5e..e571d36 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/aptly.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_aptly_source: http://apt.mirantis.com/xenial/aptly/
- mirror_mirantis_openstack_xenial_aptly_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_aptly_source: http://mirror.mirantis.com/${_param:apt_mk_version}/aptly/
+ mirror_mirantis_openstack_xenial_aptly_distribution: squeeze
mirror_mirantis_openstack_xenial_aptly_components: main
- mirror_mirantis_openstack_xenial_aptly_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_xenial_aptly_gpgkeys:
- - A76882D3
+ - 9C7DE460
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_aptly_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_aptly_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_aptly_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_aptly_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_aptly_components}
+ component: main
distributions:
- ubuntu-xenial/aptly/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml
index 5afbf77..2b931af 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/cassandra.yml
@@ -1,12 +1,14 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_cassandra_source: http://apt.mirantis.com/xenial/cassandra/
- mirror_mirantis_openstack_xenial_cassandra_distribution: ${_param:apt_mk_version}
- mirror_mirantis_openstack_xenial_cassandra_components: 21x
- mirror_mirantis_openstack_xenial_cassandra_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_cassandra_source: http://mirror.mirantis.com/${_param:apt_mk_version}/cassandra/
+ mirror_mirantis_openstack_xenial_cassandra_distribution: 21x
+ mirror_mirantis_openstack_xenial_cassandra_components: main
mirror_mirantis_openstack_xenial_cassandra_gpgkeys:
- - A76882D3
+ - A278B781FE4B2BDA
+ - F758CE318D77295D
+ - 2B5C1B00
+ - 0353B12C
aptly:
server:
mirror:
@@ -15,9 +17,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_cassandra_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_cassandra_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_cassandra_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_cassandra_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_cassandra_components}
+ component: 21x
distributions:
- ubuntu-xenial/cassandra/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml
index a0b1293..dd6ba6a 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/ceph.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_ceph_source: http://apt.mirantis.com/xenial/ceph/
- mirror_mirantis_openstack_xenial_ceph_distribution: ${_param:apt_mk_version}
- mirror_mirantis_openstack_xenial_ceph_components: luminous
- mirror_mirantis_openstack_xenial_ceph_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_ceph_source: http://mirror.mirantis.com/${_param:apt_mk_version}/ceph-luminous/
+ mirror_mirantis_openstack_xenial_ceph_distribution: xenial
+ mirror_mirantis_openstack_xenial_ceph_components: main
mirror_mirantis_openstack_xenial_ceph_gpgkeys:
- - A76882D3
+ - 460F3994
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_ceph_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_ceph_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_ceph_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_ceph_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_ceph_components}
+ component: luminous
distributions:
- ubuntu-xenial/ceph/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker.yml
index 703d202..96e0b64 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/docker.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_docker_source: http://apt.mirantis.com/xenial/docker/
- mirror_mirantis_openstack_xenial_docker_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_docker_source: http://mirror.mirantis.com/${_param:apt_mk_version}/docker/
+ mirror_mirantis_openstack_xenial_docker_distribution: xenial
mirror_mirantis_openstack_xenial_docker_components: stable
- mirror_mirantis_openstack_xenial_docker_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_xenial_docker_gpgkeys:
- - A76882D3
+ - 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_docker_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_docker_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_docker_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_docker_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_docker_components}
+ component: stable
distributions:
- ubuntu-xenial/docker/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml
index 6b1c006..dd5b636 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/2x.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_elastic_2x_source: http://apt.mirantis.com/xenial/elastic/2.x/
- mirror_mirantis_openstack_xenial_elastic_2x_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_elastic_2x_source: http://mirror.mirantis.com/${_param:apt_mk_version}/elasticsearch-2.x/
+ mirror_mirantis_openstack_xenial_elastic_2x_distribution: stable
mirror_mirantis_openstack_xenial_elastic_2x_components: main
- mirror_mirantis_openstack_xenial_elastic_2x_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_xenial_elastic_2x_gpgkeys:
- - A76882D3
+ - D88E42B4
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_elastic_2x_components}
+ component: main
distributions:
- ubuntu-xenial/elastic/2.x/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml
index d7e92c6..0448289 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/elastic/5x.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_elastic_5x_source: http://apt.mirantis.com/xenial/elastic/5.x/
- mirror_mirantis_openstack_xenial_elastic_5x_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_elastic_5x_source: http://mirror.mirantis.com/${_param:apt_mk_version}/elasticsearch-5.x/
+ mirror_mirantis_openstack_xenial_elastic_5x_distribution: stable
mirror_mirantis_openstack_xenial_elastic_5x_components: main
- mirror_mirantis_openstack_xenial_elastic_5x_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_xenial_elastic_5x_gpgkeys:
- - A76882D3
+ - D88E42B4
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_elastic_5x_components}
+ component: main
distributions:
- ubuntu-xenial/elastic/5.x/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/glusterfs.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/glusterfs.yml
index cfec221..f925041 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/glusterfs.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/glusterfs.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_glusterfs_source: http://apt.mirantis.com/xenial/glusterfs/
- mirror_mirantis_openstack_xenial_glusterfs_distribution: ${_param:apt_mk_version}
- mirror_mirantis_openstack_xenial_glusterfs_components: '"3.12"'
- mirror_mirantis_openstack_xenial_glusterfs_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_glusterfs_source: http://mirror.mirantis.com/${_param:apt_mk_version}/glusterfs-3.8/
+ mirror_mirantis_openstack_xenial_glusterfs_distribution: xenial
+ mirror_mirantis_openstack_xenial_glusterfs_components: main
mirror_mirantis_openstack_xenial_glusterfs_gpgkeys:
- - A76882D3
+ - 3FE869A9
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_glusterfs_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_glusterfs_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_glusterfs_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_glusterfs_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_glusterfs_components}
+ component: '"3.8"'
distributions:
- ubuntu-xenial/glusterfs/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/grafana.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/grafana.yml
index e09ba61..6c1a3de 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/grafana.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/grafana.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_grafana_source: http://apt.mirantis.com/xenial/grafana/
- mirror_mirantis_openstack_xenial_grafana_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_grafana_source: http://mirror.mirantis.com/${_param:apt_mk_version}/grafana/
+ mirror_mirantis_openstack_xenial_grafana_distribution: jessie
mirror_mirantis_openstack_xenial_grafana_components: main
- mirror_mirantis_openstack_xenial_grafana_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_xenial_grafana_gpgkeys:
- - A76882D3
+ - D59097AB
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_grafana_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_grafana_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_grafana_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_grafana_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_grafana_components}
+ component: main
distributions:
- ubuntu-xenial/grafana/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/influxdb.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/influxdb.yml
index 01093fe..1262270 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/influxdb.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/influxdb.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_influxdb_source: http://apt.mirantis.com/xenial/influxdb/
- mirror_mirantis_openstack_xenial_influxdb_distribution: ${_param:apt_mk_version}
- mirror_mirantis_openstack_xenial_influxdb_components: main
- mirror_mirantis_openstack_xenial_influxdb_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_influxdb_source: http://mirror.mirantis.com/${_param:apt_mk_version}/influxdb/
+ mirror_mirantis_openstack_xenial_influxdb_distribution: xenial
+ mirror_mirantis_openstack_xenial_influxdb_components: stable
mirror_mirantis_openstack_xenial_influxdb_gpgkeys:
- - A76882D3
+ - 2582E0C5
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_influxdb_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_influxdb_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_influxdb_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_influxdb_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_influxdb_components}
+ component: main
distributions:
- ubuntu-xenial/influxdb/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml
index 815185b..67fecc1 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/46.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_kibana_46_source: http://apt.mirantis.com/xenial/kibana/4.6/
- mirror_mirantis_openstack_xenial_kibana_46_distribution: ${_param:apt_mk_version}
- mirror_mirantis_openstack_xenial_kibana_46_components: "kibana-46"
- mirror_mirantis_openstack_xenial_kibana_46_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_kibana_46_source: http://mirror.mirantis.com/${_param:apt_mk_version}/kibana-4.6/
+ mirror_mirantis_openstack_xenial_kibana_46_distribution: stable
+ mirror_mirantis_openstack_xenial_kibana_46_components: main
mirror_mirantis_openstack_xenial_kibana_46_gpgkeys:
- - A76882D3
+ - D88E42B4
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_kibana_46_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_kibana_46_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_kibana_46_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_kibana_46_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_kibana_46_components}
+ component: kibana-46
distributions:
- ubuntu-xenial/kibana/4.6/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml
index c1b061e..c739bca 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/kibana/5x.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_kibana_5x_source: http://apt.mirantis.com/xenial/kibana/5.x/
- mirror_mirantis_openstack_xenial_kibana_5x_distribution: ${_param:apt_mk_version}
- mirror_mirantis_openstack_xenial_kibana_5x_components: "kibana-5x"
- mirror_mirantis_openstack_xenial_kibana_5x_key_url: "http://apt.mirantis.com/public.gpg"
+ mirror_mirantis_openstack_xenial_kibana_5x_source: http://mirror.mirantis.com/${_param:apt_mk_version}/elasticsearch-5.x/
+ mirror_mirantis_openstack_xenial_kibana_5x_distribution: stable
+ mirror_mirantis_openstack_xenial_kibana_5x_components: main
mirror_mirantis_openstack_xenial_kibana_5x_gpgkeys:
- - A76882D3
+ - D88E42B4
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_kibana_5x_components}
+ component: kibana-5x
distributions:
- ubuntu-xenial/kibana/5.x/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/maas.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/maas.yml
index 3d63b00..51abdf8 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/maas.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/maas.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_maas_source: http://apt.mirantis.com/xenial/maas/
- mirror_mirantis_openstack_xenial_maas_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_maas_source: http://mirror.mirantis.com/${_param:apt_mk_version}/maas/
+ mirror_mirantis_openstack_xenial_maas_distribution: xenial
mirror_mirantis_openstack_xenial_maas_components: main
- mirror_mirantis_openstack_xenial_maas_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_xenial_maas_gpgkeys:
- - A76882D3
+ - 684D4A1C
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_maas_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_maas_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_maas_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_maas_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_maas_components}
+ component: main
distributions:
- ubuntu-xenial/maas/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2016-3.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2016-3.yml
index 86a33e6..13e4e50 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2016-3.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2016-3.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_saltstack_2016_3_source: http://apt.mirantis.com/xenial/salt/2016.3/
- mirror_mirantis_openstack_xenial_saltstack_2016_3_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_saltstack_2016_3_source: http://mirror.mirantis.com/${_param:apt_mk_version}/saltstack-2016.3/
+ mirror_mirantis_openstack_xenial_saltstack_2016_3_distribution: xenial
mirror_mirantis_openstack_xenial_saltstack_2016_3_components: main
- mirror_mirantis_openstack_xenial_saltstack_2016_3_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_xenial_saltstack_2016_3_gpgkeys:
- - A76882D3
+ - DE57BFBE
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_saltstack_2016_3_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_saltstack_2016_3_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_saltstack_2016_3_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_saltstack_2016_3_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_saltstack_2016_3_components}
+ component: main
distributions:
- ubuntu-xenial/salt/2016.3/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2017-7.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2017-7.yml
index 0478cde..98cfb1d 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2017-7.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/saltstack/salt-2017-7.yml
@@ -1,12 +1,11 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_saltstack_2017_7_source: http://apt.mirantis.com/xenial/salt/2017.7/
- mirror_mirantis_openstack_xenial_saltstack_2017_7_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_saltstack_2017_7_source: http://mirror.mirantis.com/${_param:apt_mk_version}/saltstack-2017.7/
+ mirror_mirantis_openstack_xenial_saltstack_2017_7_distribution: xenial
mirror_mirantis_openstack_xenial_saltstack_2017_7_components: main
- mirror_mirantis_openstack_xenial_saltstack_2017_7_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_xenial_saltstack_2017_7_gpgkeys:
- - A76882D3
+ - DE57BFBE
aptly:
server:
mirror:
@@ -15,9 +14,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_saltstack_2017_7_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_saltstack_2017_7_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_saltstack_2017_7_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_saltstack_2017_7_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_saltstack_2017_7_components}
+ component: main
distributions:
- ubuntu-xenial/salt/2017.7/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/sensu.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/sensu.yml
index 505ec97..888c203 100644
--- a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/sensu.yml
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/sensu.yml
@@ -1,12 +1,12 @@
parameters:
_param:
apt_mk_version: stable
- mirror_mirantis_openstack_xenial_sensu_source: http://apt.mirantis.com/xenial/sensu/
- mirror_mirantis_openstack_xenial_sensu_distribution: ${_param:apt_mk_version}
+ mirror_mirantis_openstack_xenial_sensu_source: http://mirror.mirantis.com/${_param:apt_mk_version}/sensu/
+ mirror_mirantis_openstack_xenial_sensu_distribution: sensu
mirror_mirantis_openstack_xenial_sensu_components: main
mirror_mirantis_openstack_xenial_sensu_key_url: "http://apt.mirantis.com/public.gpg"
mirror_mirantis_openstack_xenial_sensu_gpgkeys:
- - A76882D3
+ - EB9C94BB
aptly:
server:
mirror:
@@ -15,9 +15,8 @@
distribution: ${_param:mirror_mirantis_openstack_xenial_sensu_distribution}
components: ${_param:mirror_mirantis_openstack_xenial_sensu_components}
architectures: amd64
- key_url: ${_param:mirror_mirantis_openstack_xenial_sensu_key_url}
gpgkeys: ${_param:mirror_mirantis_openstack_xenial_sensu_gpgkeys}
publisher:
- component: ${_param:mirror_mirantis_openstack_xenial_sensu_components}
+ component: main
distributions:
- ubuntu-xenial/sensu/${_param:apt_mk_version}
\ No newline at end of file
diff --git a/linux/system/repo/mcp/apt_mirantis/aptly.yml b/linux/system/repo/mcp/apt_mirantis/aptly.yml
index b0cf536..f91c2ed 100644
--- a/linux/system/repo/mcp/apt_mirantis/aptly.yml
+++ b/linux/system/repo/mcp/apt_mirantis/aptly.yml
@@ -6,11 +6,8 @@
system:
repo:
mcp_aptly:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/aptly/ ${_param:linux_system_repo_mcp_aptly_version} main"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_aptly_version}/aptly/ squeeze main"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: 9E3E53F19C7DE460
+ key_server: keys.gnupg.net
clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_aptly_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/cassandra.yml b/linux/system/repo/mcp/apt_mirantis/cassandra.yml
index 308f555..337321c 100644
--- a/linux/system/repo/mcp/apt_mirantis/cassandra.yml
+++ b/linux/system/repo/mcp/apt_mirantis/cassandra.yml
@@ -7,11 +7,8 @@
system:
repo:
mcp_cassandra:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/cassandra/ ${_param:linux_system_repo_mcp_cassandra_version} ${_param:linux_system_repo_mcp_cassandra_version_number}"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_cassandra_version}/cassandra/ ${_param:linux_system_repo_mcp_cassandra_version_number} main"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: F8358FA2F2833C93
+ key_server: keyserver.ubuntu.com
clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_cassandra_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/ceph.yml b/linux/system/repo/mcp/apt_mirantis/ceph.yml
index 2532f86..483c302 100644
--- a/linux/system/repo/mcp/apt_mirantis/ceph.yml
+++ b/linux/system/repo/mcp/apt_mirantis/ceph.yml
@@ -7,11 +7,8 @@
system:
repo:
mcp_ceph:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/ceph/ ${_param:linux_system_repo_mcp_ceph_version} ${_param:linux_system_repo_mcp_ceph_codename}"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_ceph_version}/ceph-${_param:linux_system_repo_mcp_ceph_codename}/ ${_param:linux_system_codename} main"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
- clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_ceph_version}'
- priority: 1100
- package: '*'
\ No newline at end of file
+ key_id: E84AC2C0460F3994
+ key_server: keyserver.ubuntu.com
+ clean_file: true
\ No newline at end of file
diff --git a/linux/system/repo/mcp/apt_mirantis/docker.yml b/linux/system/repo/mcp/apt_mirantis/docker.yml
index cbd3097..d549979 100644
--- a/linux/system/repo/mcp/apt_mirantis/docker.yml
+++ b/linux/system/repo/mcp/apt_mirantis/docker.yml
@@ -6,11 +6,8 @@
system:
repo:
mcp_docker:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/docker/ ${_param:linux_system_repo_mcp_docker_version} stable"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_docker_version}/docker/ ${_param:linux_system_codename} stable"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
- clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_docker_version}'
- priority: 1100
- package: '*'
+ key_id: 8D81803C0EBFCD88
+ key_server: keyserver.ubuntu.com
+ clean_file: true
\ No newline at end of file
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
index 4add81e..d98baf8 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
@@ -6,11 +6,8 @@
system:
repo:
mcp_elastic_2x:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/elastic/2.x/ ${_param:linux_system_repo_mcp_elastic_2x_version} main"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_elastic_2x_version}/elasticsearch-2.x/ stable main"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: D88E42B4
+ key_server: keyserver.ubuntu.com
clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_elastic_2x_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
index 8876c51..6209d53 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
@@ -6,11 +6,8 @@
system:
repo:
mcp_elastic_5x:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/elastic/5.x/ ${_param:linux_system_repo_mcp_elastic_5x_version} main"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_elastic_5x_version}/elasticsearch-5.x/ stable main"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: D88E42B4
+ key_server: keyserver.ubuntu.com
clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_elastic_5x_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/fluentd.yml b/linux/system/repo/mcp/apt_mirantis/fluentd.yml
index 246d285..2bca860 100644
--- a/linux/system/repo/mcp/apt_mirantis/fluentd.yml
+++ b/linux/system/repo/mcp/apt_mirantis/fluentd.yml
@@ -8,9 +8,6 @@
mcp_fluentd:
source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_fluentd_version}/td-agent-${_param:linux_system_codename} ${_param:linux_system_codename} contrib"
architectures: amd64
- key_url: "http://packages.treasuredata.com/GPG-KEY-td-agent"
+ key_id: 901F9177AB97ACBE
+ key_server: keyserver.ubuntu.com
clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_fluentd_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/glusterfs.yml b/linux/system/repo/mcp/apt_mirantis/glusterfs.yml
index 1f5dd0e..8c0219e 100644
--- a/linux/system/repo/mcp/apt_mirantis/glusterfs.yml
+++ b/linux/system/repo/mcp/apt_mirantis/glusterfs.yml
@@ -2,16 +2,13 @@
_param:
apt_mk_version: stable
linux_system_repo_mcp_glusterfs_version: ${_param:apt_mk_version}
- linux_system_repo_mcp_glusterfs_version_number: "3.12"
+ linux_system_repo_mcp_glusterfs_version_number: "3.8"
linux:
system:
repo:
mcp_glusterfs:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/glusterfs/ ${_param:linux_system_repo_mcp_glusterfs_version} ${_param:linux_system_repo_mcp_glusterfs_version_number}"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_glusterfs_version}/glusterfs-${_param:linux_system_repo_mcp_glusterfs_version_number}/ ${_param:linux_system_codename} main"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: 3FE869A9
+ key_server: keyserver.ubuntu.com
clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_glusterfs_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/grafana.yml b/linux/system/repo/mcp/apt_mirantis/grafana.yml
index 2d71740..7afe4a1 100644
--- a/linux/system/repo/mcp/apt_mirantis/grafana.yml
+++ b/linux/system/repo/mcp/apt_mirantis/grafana.yml
@@ -6,11 +6,8 @@
system:
repo:
mcp_grafana:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/grafana/ ${_param:linux_system_repo_mcp_grafana_version} main"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_grafana_version}/grafana/ jessie main"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: C2E73424D59097AB
+ key_server: keyserver.ubuntu.com
clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_grafana_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/influxdb.yml b/linux/system/repo/mcp/apt_mirantis/influxdb.yml
index f3c1fec..9f0d17a 100644
--- a/linux/system/repo/mcp/apt_mirantis/influxdb.yml
+++ b/linux/system/repo/mcp/apt_mirantis/influxdb.yml
@@ -6,11 +6,8 @@
system:
repo:
mcp_influxdb:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/influxdb/ ${_param:linux_system_repo_mcp_influxdb_version} main"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_influxdb_version}/influxdb/ ${_param:linux_system_codename} stable"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: 684A14CF2582E0C5
+ key_server: keyserver.ubuntu.com
clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_influxdb_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/kibana/46.yml b/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
index f3795ad..49d4494 100644
--- a/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
+++ b/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
@@ -6,11 +6,8 @@
system:
repo:
mcp_kibana_46:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/kibana/4.6/ ${_param:linux_system_repo_mcp_kibana_46_version} kibana-46"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_kibana_46_version}/kibana-4.6/ stable main"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: D88E42B4
+ key_server: keyserver.ubuntu.com
clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_kibana_46_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml b/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml
index e2f4795..38bbbf3 100644
--- a/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml
+++ b/linux/system/repo/mcp/apt_mirantis/kibana/5x.yml
@@ -6,11 +6,8 @@
system:
repo:
mcp_kibana_5x:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/kibana/5.x/ ${_param:linux_system_repo_mcp_kibana_5x_version} kibana-5x"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_kibana_5x_version}/elasticsearch-5.x/ stable main"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: D88E42B4
+ key_server: keyserver.ubuntu.com
clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_kibana_5x_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/maas.yml b/linux/system/repo/mcp/apt_mirantis/maas.yml
index b18bf65..d4e41c9 100644
--- a/linux/system/repo/mcp/apt_mirantis/maas.yml
+++ b/linux/system/repo/mcp/apt_mirantis/maas.yml
@@ -6,11 +6,8 @@
system:
repo:
mcp_maas:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/maas/ ${_param:linux_system_repo_mcp_maas_version} main"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_maas_version}/maas/ ${_param:linux_system_codename} main"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: 684D4A1C
+ key_server: keyserver.ubuntu.com
clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_maas_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml b/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
index bec95cd..4162488 100644
--- a/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
+++ b/linux/system/repo/mcp/apt_mirantis/saltstack_2016_3.yml
@@ -6,11 +6,8 @@
system:
repo:
mcp_saltstack:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/salt/2016.3/ ${_param:linux_system_repo_mcp_saltstack_version} main"
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_saltstack_version}/saltstack-2016.3/ ${_param:linux_system_codename} main"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: 0E08A149DE57BFBE
+ key_server: keyserver.ubuntu.com
clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_saltstack_version}'
- priority: 1100
- package: '*'
\ No newline at end of file
diff --git a/linux/system/repo/mcp/apt_mirantis/sensu.yml b/linux/system/repo/mcp/apt_mirantis/sensu.yml
index f86b88a..d6ae0d0 100644
--- a/linux/system/repo/mcp/apt_mirantis/sensu.yml
+++ b/linux/system/repo/mcp/apt_mirantis/sensu.yml
@@ -1,16 +1,13 @@
parameters:
_param:
apt_mk_version: stable
- linux_system_repo_mcp_extra_version: ${_param:apt_mk_version}
+ linux_system_repo_mcp_sensu_version: ${_param:apt_mk_version}
linux:
system:
repo:
- mcp_extra:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/sensu/ ${_param:linux_system_repo_mcp_extra_version} main"
+ mcp_sensu:
+ source: "deb [arch=amd64] http://mirror.mirantis.com/${_param:linux_system_repo_mcp_sensu_version}/sensu/ sensu main"
architectures: amd64
- key_url: "http://apt.mirantis.com/public.gpg"
+ key_id: A20F259AEB9C94BB
+ key_server: keyserver.ubuntu.com
clean_file: true
- pin:
- - pin: 'release a=${_param:linux_system_repo_mcp_extra_version}'
- priority: 1100
- package: '*'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml b/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml
index ca7e1bd..cb3444b 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml
@@ -2,7 +2,7 @@
_param:
apt_mk_version: stable
linux_system_repo_mcp_glusterfs_version: ${_param:apt_mk_version}
- linux_system_repo_mcp_glusterfs_version_number: "3.12"
+ linux_system_repo_mcp_glusterfs_version_number: "3.8"
linux:
system:
repo: