diff options
| author | Martin André <m.andre@redhat.com> | 2018-07-08 23:00:27 +0200 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2018-07-10 16:32:18 +0200 |
| commit | 5951977eab3865eace96857df52914f41bd90146 (patch) | |
| tree | 7aea8dc1dcb9bbcbf7a161a3ca37a87f44952b1d /docker/telegraf | |
| parent | 11dcd27994e226bc5c4a9719518ca82b57d863e3 (diff) | |
| download | kolla-5951977eab3865eace96857df52914f41bd90146.tar.gz kolla-5951977eab3865eace96857df52914f41bd90146.zip | |
Stop using deprecated rpm package names
These packages produce a warning during the installation, we should
switch to their new names, usually to be specific about their use of
python2.
Change-Id: I0a80e822f64222d9a32aabd1fd834bcf794d6320
Diffstat (limited to 'docker/telegraf')
| -rw-r--r-- | docker/telegraf/Dockerfile.j2 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2 index c22848000..b43f9fed4 100644 --- a/docker/telegraf/Dockerfile.j2 +++ b/docker/telegraf/Dockerfile.j2 @@ -10,17 +10,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set telegraf_packages = [ 'chrony', 'net-tools', - 'python-pip', 'telegraf' ] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set telegraf_packages = telegraf_packages + [ - 'collectd' + 'collectd', + 'python2-pip' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set telegraf_packages = telegraf_packages + [ - 'collectd-core' + 'collectd-core', + 'python-pip' ] %} {% endif %} |
