diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-01-30 11:37:00 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-02-04 19:20:24 +0100 |
| commit | 8f1ca9a1ba0c00967853a835a455153645abe48d (patch) | |
| tree | 80a88c3004a1d09d9f75a32fca02c56cba06a493 | |
| parent | 49445b68f8e195f4db7aebe972415d1d620665dc (diff) | |
| download | kolla-8f1ca9a1ba0c00967853a835a455153645abe48d.tar.gz kolla-8f1ca9a1ba0c00967853a835a455153645abe48d.zip | |
aarch64: enable influxdb and telegraf for Debian/Ubuntu
Turns out that upstream provides repos also for aarch64.
CentOS one is not usable due to wrong arch name used (arm64 instead of
aarch64).
Change-Id: I1b4ef1fae0914d6826af5456cc9ea53bb26972ee
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rwxr-xr-x | kolla/image/build.py | 3 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 41d16c708..85237f663 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -459,6 +459,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom 'https://packages.grafana.com/gpg.key', 'http://buster-train.debian.net/debian/dists/pubkey.gpg', 'https://packages.treasuredata.com/GPG-KEY-td-agent', + 'https://repos.influxdata.com/influxdb.key' ] %} {% set base_apt_packages = base_apt_packages + ['sudo',] diff --git a/kolla/image/build.py b/kolla/image/build.py index c01615c50..f3fd56038 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -89,7 +89,6 @@ UNBUILDABLE_IMAGES = { "opendaylight", # no binary package "prometheus-mtail", # no aarch64 binary "skydive-base", # no aarch64 binary - "telegraf", # no binary package }, 'ppc64le': { @@ -178,7 +177,6 @@ UNBUILDABLE_IMAGES = { "ovsdpdk", "qdrouterd", "sensu-base", - "telegraf", # no binary package }, 'ubuntu': { "cyborg-base", @@ -198,6 +196,7 @@ UNBUILDABLE_IMAGES = { "hacluster-pcs", # no binary package "influxdb", # no binary package "mongodb", # no binary package + "telegraf", # no binary package }, 'centos+ppc64le': { diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 90f245368..777a0ed6c 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -54,6 +54,7 @@ rhel: {} debian: elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main" grafana: "deb https://packages.grafana.com/oss/deb stable main" + influxdb: "deb https://repos.influxdata.com/debian buster stable" kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main" td-agent: "deb http://packages.treasuredata.com/3/debian/buster buster contrib" @@ -72,6 +73,7 @@ ubuntu: ubuntu-aarch64: elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main" grafana: "deb https://packages.grafana.com/oss/deb stable main" + influxdb: "deb https://repos.influxdata.com/ubuntu bionic stable" kibana: "deb https://artifacts.elastic.co/packages/5.x/apt stable main" mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main" rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main" |