diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-09 15:43:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-09 15:43:19 +0000 |
| commit | 6cdb294960cdbeacae7bf198fcffa1d740d5d4e4 (patch) | |
| tree | 937a17ab85db77b7298b1bfb1b640f3d6146486c /docker/base | |
| parent | 64117209763eccad222e628e1479dc3768da5c10 (diff) | |
| parent | 35314e77ee3aa288a07e6792236a9f398225bc67 (diff) | |
| download | kolla-6cdb294960cdbeacae7bf198fcffa1d740d5d4e4.tar.gz kolla-6cdb294960cdbeacae7bf198fcffa1d740d5d4e4.zip | |
Merge "Move fluentd td.repo to base for consistency"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/base/sources.list.debian | 3 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 3 | ||||
| -rw-r--r-- | docker/base/td.repo | 5 |
4 files changed, 19 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index e3e97a6c7..6e564b774 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -42,13 +42,13 @@ RUN CURRENT_DISTRO_RELEASE=$(awk '{match($0, /[0-9]+/,version)}END{print version && sed -i 's|^\(override_install_langs=.*\)|# \1|' /etc/yum.conf #### BEGIN REPO ENABLEMENT -# Turns on Elasticsearch repos {% set base_yum_repo_files = [ 'elasticsearch.repo', + 'grafana.repo', + 'influxdb.repo', 'kibana.yum.repo', 'MariaDB.repo', - 'influxdb.repo', - 'grafana.repo', + 'td.repo', 'zookeeper.repo' ] %} {%- for repo_file in base_yum_repo_files | customizable('yum_repo_files') %} @@ -65,7 +65,8 @@ COPY {{ repo_file }} /etc/yum.repos.d/{{ repo_file }} 'https://packages.elastic.co/GPG-KEY-elasticsearch', 'https://repos.influxdata.com/influxdb.key', 'https://packagecloud.io/gpg.key', - 'https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana' + 'https://grafanarel.s3.amazonaws.com/RPM-GPG-KEY-grafana', + 'https://packages.treasuredata.com/GPG-KEY-td-agent' ] %} {%- for key in base_yum_repo_keys | customizable('yum_repo_keys') %} @@ -252,6 +253,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #} {# 4D1BB29D63D98E422B2113B19334A25F8507EFA5 -- Percona MySQL Development Team (Packaging key) <mysql-dev@percona.com> #} {# 58118E89F3A912897C070ADBF76221572C52609D -- Docker Release Tool (releasedocker) <docker@docker.com> #} + {# 901F9177AB97ACBE -- Treasure Data, Inc (Treasure Agent Official Signing key) <support@treasure-data.com> #} {% set base_apt_keys = [ '05CE15085FC09D18E99EFB22684A14CF2582E0C5', '177F4010FE56CA3336300305F1656F24C74CD1D8', @@ -260,6 +262,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences '46095ACC8548582C1A2699A9D27D666CD88E42B4', '4D1BB29D63D98E422B2113B19334A25F8507EFA5', '58118E89F3A912897C070ADBF76221572C52609D', + '901F9177AB97ACBE', ] %} {% elif base_distro == 'debian' %} {% set base_apt_keys = [ @@ -268,6 +271,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences 'D27D666CD88E42B4', '05CE15085FC09D18E99EFB22684A14CF2582E0C5', '418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB', + '901F9177AB97ACBE', ] %} {% set base_apt_packages = base_apt_packages + ['sudo',] diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index 248c6a06a..f1195c943 100644 --- a/docker/base/sources.list.debian +++ b/docker/base/sources.list.debian @@ -30,3 +30,6 @@ deb https://repos.influxdata.com/debian jessie stable # Grafana repo deb https://packagecloud.io/grafana/stable/debian/ jessie main + +# Fluentd repo +deb http://packages.treasuredata.com/2/debian/jessie/ jessie contrib diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index 22a1d78c9..990ffc957 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -30,3 +30,6 @@ deb https://repos.influxdata.com/ubuntu xenial stable # Grafana repo deb https://packagecloud.io/grafana/stable/debian/ jessie main + +# Fluentd repo +deb http://packages.treasuredata.com/2/ubuntu/xenial/ xenial contrib diff --git a/docker/base/td.repo b/docker/base/td.repo new file mode 100644 index 000000000..abecf7e2c --- /dev/null +++ b/docker/base/td.repo @@ -0,0 +1,5 @@ +[treasuredata] +name=TreasureData +baseurl=http://packages.treasuredata.com/2/redhat/\$releasever/\$basearch +gpgcheck=1 +gpgkey=https://packages.treasuredata.com/GPG-KEY-td-agent |