aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
authorMathias Ewald <mewald@evoila.de>2016-07-23 17:29:27 +0000
committerMathias Ewald <mewald@evoila.de>2016-07-29 13:19:40 +0000
commite5ca547f373bdae7207236190422fd18840dd711 (patch)
tree745fa2b75fd46ae9be4ebec1d90220b0bb83fec2 /docker/base/Dockerfile.j2
parent74ea96bacfaa082db2f64aa3cc78aed59ea5822b (diff)
downloadkolla-e5ca547f373bdae7207236190422fd18840dd711.tar.gz
kolla-e5ca547f373bdae7207236190422fd18840dd711.zip
Added telegraf container
Extended base container to include influxdb repositories Added telegraf container with package from influxdb repo Change-Id: I6ccf952d7b42eabe8ff7bdbd6471e395db86aa02 Partially-Implements: Blueprint performance-monitoring
Diffstat (limited to 'docker/base/Dockerfile.j2')
-rw-r--r--docker/base/Dockerfile.j28
1 files changed, 7 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 8e7e600ef..1503d5039 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -40,11 +40,15 @@ COPY kibana.yum.repo /etc/yum.repos.d/kibana.yum.repo
# Turns on MariaDB repos throughout the RPM build
COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo
+# Turns on InfluxDB repos throughout the RPM build
+COPY influxdb.yum.repo /etc/yum.repos.d/influxdb.repo
+
RUN yum -y install \
http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-3.noarch.rpm \
&& rpm --import http://yum.mariadb.org/RPM-GPG-KEY-MariaDB \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Percona \
- && rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch
+ && rpm --import https://packages.elastic.co/GPG-KEY-elasticsearch \
+ && rpm --import https://repos.influxdata.com/influxdb.key
{% if install_metatype in ['rdo', 'mixed'] %}
@@ -209,6 +213,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
'08B73419AC32B4E966C1A330E84AC2C0460F3994',
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
'58118E89F3A912897C070ADBF76221572C52609D',
+ '05CE15085FC09D18E99EFB22684A14CF2582E0C5',
] %}
{% elif base_distro == 'debian' %}
{% set base_apt_keys = [
@@ -216,6 +221,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
'58118E89F3A912897C070ADBF76221572C52609D',
'0xcbcb082a1bb943db',
'D27D666CD88E42B4',
+ '05CE15085FC09D18E99EFB22684A14CF2582E0C5',
] %}
{% set base_apt_packages = base_apt_packages +
['sudo',]