Updated mirror for fluentd to mirror.mirantis.com
Change-Id: If9963b936a695d591d71ef01e2948c1c78581dbf
Closes-Bug: PROD-17888
diff --git a/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/fluentd.yml b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/fluentd.yml
new file mode 100644
index 0000000..060e5ec
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/trusty/mcp/apt_mk/fluentd.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_trusty_fluentd_source: http://mirror.mirantis.com/${_param:apt_mk_version}/td-agent-trusty
+ mirror_mirantis_openstack_trusty_fluentd_distribution: trusty
+ mirror_mirantis_openstack_trusty_fluentd_components: contrib
+ mirror_mirantis_openstack_trusty_fluentd_gpgkeys:
+ - 901F9177AB97ACBE
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_trusty_fluentd:
+ source: ${_param:mirror_mirantis_openstack_trusty_fluentd_source}
+ distribution: ${_param:mirror_mirantis_openstack_trusty_fluentd_distribution}
+ components: ${_param:mirror_mirantis_openstack_trusty_fluentd_components}
+ architectures: amd64
+ gpgkeys: ${_param:mirror_mirantis_openstack_trusty_fluentd_gpgkeys}
+ publisher:
+ component: contrib
+ distributions:
+ - ubuntu-trusty/fluentd/${_param:apt_mk_version}
diff --git a/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/fluentd.yml b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/fluentd.yml
new file mode 100644
index 0000000..e87580c
--- /dev/null
+++ b/aptly/server/mirror/ubuntu/xenial/mcp/apt_mk/fluentd.yml
@@ -0,0 +1,21 @@
+parameters:
+ _param:
+ apt_mk_version: stable
+ mirror_mirantis_openstack_xenial_fluentd_source: http://mirror.mirantis.com/${_param:apt_mk_version}/td-agent-xenial
+ mirror_mirantis_openstack_xenial_fluentd_distribution: xenial
+ mirror_mirantis_openstack_xenial_fluentd_components: contrib
+ mirror_mirantis_openstack_xenial_fluentd_gpgkeys:
+ - 901F9177AB97ACBE
+ aptly:
+ server:
+ mirror:
+ mirantis_openstack_xenial_fluentd:
+ source: ${_param:mirror_mirantis_openstack_xenial_fluentd_source}
+ distribution: ${_param:mirror_mirantis_openstack_xenial_fluentd_distribution}
+ components: ${_param:mirror_mirantis_openstack_xenial_fluentd_components}
+ architectures: amd64
+ gpgkeys: ${_param:mirror_mirantis_openstack_xenial_fluentd_gpgkeys}
+ publisher:
+ component: contrib
+ distributions:
+ - ubuntu-xenial/fluentd/${_param:apt_mk_version}
diff --git a/linux/system/repo/mcp/apt_mirantis/fluentd.yml b/linux/system/repo/mcp/apt_mirantis/fluentd.yml
index da7d3ca..246d285 100644
--- a/linux/system/repo/mcp/apt_mirantis/fluentd.yml
+++ b/linux/system/repo/mcp/apt_mirantis/fluentd.yml
@@ -6,9 +6,9 @@
system:
repo:
mcp_fluentd:
- source: "deb [arch=amd64] http://apt.mirantis.com/${_param:linux_system_codename}/fluentd/ ${_param:linux_system_repo_mcp_fluentd_version} main"
+ 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://apt.mirantis.com/public.gpg"
+ key_url: "http://packages.treasuredata.com/GPG-KEY-td-agent"
clean_file: true
pin:
- pin: 'release a=${_param:linux_system_repo_mcp_fluentd_version}'
diff --git a/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml b/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml
index 40682d7..d0a1671 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml
@@ -6,7 +6,7 @@
system:
repo:
mcp_fluentd:
- source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/fluentd/ ${_param:linux_system_repo_mcp_fluentd_version} main"
+ source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/fluentd ${_param:apt_mk_version} contrib"
architectures: amd64
key_url: "http://${_param:local_repo_url}/public.gpg"
clean_file: true