openstack/kolla
Code Issues Proposed changes

Fix the ipmitool missing for ceilometer-ipmi image

Browse Source 
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
This commit is contained in:
ZhijunWei 2018-04-29 04:46:27 +00:00 committed by caoyuan
parent e9f6e4cf8c
commit 5695a65270
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
docker/ceilometer/ceilometer-ipmi/Dockerfile.j2
View File

@ -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 %}