diff options
| author | ZhijunWei <wzj334965317@outlook.com> | 2018-04-29 04:46:27 +0000 |
|---|---|---|
| committer | caoyuan <cao.yuan@99cloud.net> | 2018-05-14 16:35:32 +0000 |
| commit | 5695a6527082a686c56747551ef5e5bf07626b17 (patch) | |
| tree | 66b31de9e1f4812a745ac6ab27ce22f45893d1df /docker/ceilometer | |
| parent | e9f6e4cf8c6b3be63911ff1b1a9afaf129729e7b (diff) | |
| download | kolla-5695a6527082a686c56747551ef5e5bf07626b17.tar.gz kolla-5695a6527082a686c56747551ef5e5bf07626b17.zip | |
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 <cao.yuan@99cloud.net>
Change-Id: I45b66277c31a4d0e33e0c14e01313aa688287ec7
Closes-Bug: #1767750
Diffstat (limited to 'docker/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 | 21 |
1 files changed, 18 insertions, 3 deletions
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 %} |