moved release repositories to mirror.mirantis.com
Related: PROD-17108
Change-Id: I1167ad1e4823e2c9f91f15d4741fc48da19b8aec
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: