openstack
/
kolla
Code Issues Proposed changes

Merge "aarch64: enable influxdb and telegraf for Debian/Ubuntu"

This commit is contained in:
Zuul 2020-02-10 06:37:23 +00:00 committed by Gerrit Code Review
parent 5183438a99 8f1ca9a1ba
commit bde94ceb5a
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/base/Dockerfile.j2
View File

@ -459,6 +459,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
'https://packages.grafana.com/gpg.key', 'https://packages.grafana.com/gpg.key',
'http://buster-train.debian.net/debian/dists/pubkey.gpg', 'http://buster-train.debian.net/debian/dists/pubkey.gpg',
'https://packages.treasuredata.com/GPG-KEY-td-agent', 'https://packages.treasuredata.com/GPG-KEY-td-agent',
'https://repos.influxdata.com/influxdb.key'
] %} ] %}
{% set base_apt_packages = base_apt_packages + {% set base_apt_packages = base_apt_packages +
['sudo',] ['sudo',]

3
kolla/image/build.py
View File

@ -89,7 +89,6 @@ UNBUILDABLE_IMAGES = {
"opendaylight", # no binary package "opendaylight", # no binary package
"prometheus-mtail", # no aarch64 binary "prometheus-mtail", # no aarch64 binary
"skydive-base", # no aarch64 binary "skydive-base", # no aarch64 binary
"telegraf", # no binary package
}, },
'ppc64le': { 'ppc64le': {
@ -178,7 +177,6 @@ UNBUILDABLE_IMAGES = {
"ovsdpdk", "ovsdpdk",
"qdrouterd", "qdrouterd",
"sensu-base", "sensu-base",
"telegraf", # no binary package
}, },
'ubuntu': { 'ubuntu': {
"cyborg-base", "cyborg-base",
@ -198,6 +196,7 @@ UNBUILDABLE_IMAGES = {
"hacluster-pcs", # no binary package "hacluster-pcs", # no binary package
"influxdb", # no binary package "influxdb", # no binary package
"mongodb", # no binary package "mongodb", # no binary package
"telegraf", # no binary package
}, },
'centos+ppc64le': { 'centos+ppc64le': {

2
kolla/template/repos.yaml
View File

@ -54,6 +54,7 @@ rhel: {}
debian: debian:
elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main" elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main"
grafana: "deb https://packages.grafana.com/oss/deb 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" 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" td-agent: "deb http://packages.treasuredata.com/3/debian/buster buster contrib"
@ -72,6 +73,7 @@ ubuntu:
ubuntu-aarch64: ubuntu-aarch64:
elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main" elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main"
grafana: "deb https://packages.grafana.com/oss/deb 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" 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" 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" rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main"