diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-07-08 11:16:42 +0200 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2020-07-20 12:58:49 +0200 |
| commit | c19a222b4c2540f0875a47038f5edac9bb1c8a4d (patch) | |
| tree | 068715585a314fbce2830c1ef3743924b7e4f054 /kolla | |
| parent | 198986c51fcefef7da5c76f89400101084452ebb (diff) | |
| download | kolla-c19a222b4c2540f0875a47038f5edac9bb1c8a4d.tar.gz kolla-c19a222b4c2540f0875a47038f5edac9bb1c8a4d.zip | |
fluentd: migrate to td-agent 4 where possible
td-agent 4 got released for all distributions we support. For both
x86-64 and aarch64 architectures.
Change-Id: I86ecdc1ac45dfd76b94a34d1b837f7c0bc975dcd
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/image/build.py | 1 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 91c7c5b30..774d4a4d9 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -149,7 +149,6 @@ UNBUILDABLE_IMAGES = { 'centos+aarch64': { "elasticsearch", # no binary package - "fluentd", # no binary package "hacluster-pcs", # no binary package "influxdb", # no binary package "kibana", # no binary package diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 7ef94c28d..f22cbf902 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -26,6 +26,7 @@ centos-aarch64: hacluster: "HighAvailability" opstools: "centos-opstools" rabbitmq: "rabbitmq_rabbitmq-server" + td-agent: "treasuredata" centos-ppc64le: ceph: "centos-ceph-nautilus" @@ -50,7 +51,7 @@ debian: influxdb: "deb https://repos.influxdata.com/debian buster stable" kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main" - td-agent: "deb http://packages.treasuredata.com/3/debian/buster buster contrib" + td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib" debian-aarch64: elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" @@ -60,6 +61,7 @@ debian-aarch64: kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main" + td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib" ubuntu: elasticsearch: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main" @@ -70,7 +72,7 @@ ubuntu: mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main" qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main" - td-agent: "deb http://packages.treasuredata.com/3/ubuntu/bionic/ bionic contrib" + td-agent: "deb http://packages.treasuredata.com/4/ubuntu/bionic/ bionic contrib" ubuntu-aarch64: elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" @@ -79,6 +81,7 @@ ubuntu-aarch64: influxdb: "deb https://repos.influxdata.com/ubuntu bionic stable" mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main" rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main" + td-agent: "deb http://packages.treasuredata.com/4/ubuntu/bionic/ bionic contrib" ubuntu-ppc64le: mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main" |