From 5695a6527082a686c56747551ef5e5bf07626b17 Mon Sep 17 00:00:00 2001 From: ZhijunWei Date: Sun, 29 Apr 2018 04:46:27 +0000 Subject: Fix the ipmitool missing for ceilometer-ipmi image To enable IPMI meters, ensure IPMITool is installed[0] and the host supports Intel Node Manager. [0]: https://docs.openstack.org/ceilometer/latest/install/install-compute-rdo.html Co-Authored-By: caoyuan Change-Id: I45b66277c31a4d0e33e0c14e01313aa688287ec7 Closes-Bug: #1767750 --- docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'docker') diff --git a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 index 93c5990de..a1fa30c86 100644 --- a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 @@ -7,15 +7,30 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set ceilometer_ipmi_packages = ['openstack-ceilometer-ipmi'] %} + {% set ceilometer_ipmi_packages = [ + 'openstack-ceilometer-ipmi' + ] %} {% elif base_distro in ['debian', 'ubuntu'] %} - {% set ceilometer_ipmi_packages = ['ceilometer-agent-ipmi'] %} + {% set ceilometer_ipmi_packages = [ + 'ceilometer-agent-ipmi' + ] %} {% endif %} -{{ macros.install_packages(ceilometer_ipmi_packages | customizable("packages")) }} +{% elif install_type == 'source' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set ceilometer_ipmi_packages = [ + 'ipmitool' + ] %} + {% elif base_distro in ['debian', 'ubuntu'] %} + {% set ceilometer_ipmi_packages = [ + 'ipmitool' + ] %} + {% endif %} {% endif %} +{{ macros.install_packages(ceilometer_ipmi_packages | customizable("packages")) }} + {% block ceilometer_ipmi_footer %}{% endblock %} {% block footer %}{% endblock %} -- cgit v1.2.3