diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-22 12:55:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-22 12:55:09 +0000 |
| commit | acd0d4bf20e3b103c9a519f0f013bc9dbd67d973 (patch) | |
| tree | 2231b494395ae1c5b5ff292538406f01e396c686 /kolla | |
| parent | 9e4371d35aac6293d430d992585e48ddc5be1f05 (diff) | |
| parent | c19a222b4c2540f0875a47038f5edac9bb1c8a4d (diff) | |
| download | kolla-acd0d4bf20e3b103c9a519f0f013bc9dbd67d973.tar.gz kolla-acd0d4bf20e3b103c9a519f0f013bc9dbd67d973.zip | |
Merge "fluentd: migrate to td-agent 4 where possible"
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 8b7c2eb12..5cdcbd233 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 63aabdebc..769175c55 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -28,6 +28,7 @@ centos-aarch64: logstash: "elasticsearch-kibana-logstash-6.x" opstools: "centos-opstools" rabbitmq: "rabbitmq_rabbitmq-server" + td-agent: "treasuredata" centos-ppc64le: ceph: "centos-ceph-nautilus" @@ -54,7 +55,7 @@ debian: logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" 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" @@ -65,6 +66,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" @@ -76,7 +78,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" @@ -86,6 +88,7 @@ ubuntu-aarch64: logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main" 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" |