diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-12 19:25:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-12 19:25:29 +0000 |
| commit | 9f35bc0690e39fa24b29d3f451000bcdd6d59135 (patch) | |
| tree | 94fe7ea89495cc10a1c4e7293fdae8f3ea74ffca /docker | |
| parent | 331b3903b9b1177fdadd0ae6ad6f14282a85dd71 (diff) | |
| parent | c55fbc3265ab15bb71973c8cd7be08f5353b1fc1 (diff) | |
| download | kolla-9f35bc0690e39fa24b29d3f451000bcdd6d59135.tar.gz kolla-9f35bc0690e39fa24b29d3f451000bcdd6d59135.zip | |
Merge "Clean up collectd dockerfile" into stable/train
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index a35b4b297..ff237f543 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -13,10 +13,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_package_type == 'rpm' %} {% set collectd_packages = collectd_packages + [ + 'collectd-amqp1', 'collectd-apache', 'collectd-bind', 'collectd-ceph', 'collectd-chrony', + 'collectd-connectivity', 'collectd-curl', 'collectd-curl_json', 'collectd-curl_xml', @@ -31,36 +33,30 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'collectd-mysql', 'collectd-netlink', 'collectd-openldap', + 'collectd-ovs-events', + 'collectd-ovs-stats', 'collectd-ping', + 'collectd-procevent', 'collectd-python', 'collectd-sensors', 'collectd-sensubility', 'collectd-smart', 'collectd-snmp', + 'collectd-snmp-agent', + 'collectd-sysevent', 'collectd-utils', 'collectd-virt', 'collectd-write_http', 'collectd-write_kafka', - 'collectd-write_prometheus' + 'collectd-write_prometheus', ] %} {% if distro_python_version.startswith('3') %} - {# TODO(aschultz): there are some missing packages here #} {% set collectd_packages = collectd_packages + [ - 'collectd-ovs_events', - 'collectd-ovs_stats', - 'collectd-snmp_agent', 'python3-sqlalchemy-collectd' ] %} {% else %} {% set collectd_packages = collectd_packages + [ - 'collectd-amqp1', - 'collectd-connectivity', - 'collectd-ovs-events', - 'collectd-ovs-stats', - 'collectd-procevent', - 'collectd-snmp-agent', - 'collectd-sysevent', 'python2-collectd-gnocchi', 'python2-collectd-rabbitmq-monitoring', 'python2-sqlalchemy-collectd' @@ -86,7 +82,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'collectd-turbostat' ] %} {% endif %} - {% endif %} {% if distro_package_manager == 'yum' %} # make sure, collectd is pulled from centos-opstools |