diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-02 10:59:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-02 10:59:30 +0000 |
| commit | 082e2f4f8c27bfb30b437c2e6e0e9e51cab1c0ca (patch) | |
| tree | 1af34321e4e3ec69521908c0235f51d37333e853 | |
| parent | 8240267f1efe0aca9ca02c73eb1f6ddd0c9105bc (diff) | |
| parent | cd04dc84d0f82dfe01f10df9a2b1cdeee03ed169 (diff) | |
| download | kolla-082e2f4f8c27bfb30b437c2e6e0e9e51cab1c0ca.tar.gz kolla-082e2f4f8c27bfb30b437c2e6e0e9e51cab1c0ca.zip | |
Merge "Add ceilometer agent ipmi docker file"
| -rw-r--r-- | docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 | 22 | ||||
| -rw-r--r-- | releasenotes/notes/add-ceilometer-agent-ipmi-container-aa498b90c3d2f326.yaml | 3 |
2 files changed, 25 insertions, 0 deletions
diff --git a/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 new file mode 100644 index 000000000..93c5990de --- /dev/null +++ b/docker/ceilometer/ceilometer-ipmi/Dockerfile.j2 @@ -0,0 +1,22 @@ +FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block ceilometer_ipmi_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set ceilometer_ipmi_packages = ['openstack-ceilometer-ipmi'] %} + {% elif base_distro in ['debian', 'ubuntu'] %} + {% set ceilometer_ipmi_packages = ['ceilometer-agent-ipmi'] %} + {% endif %} + +{{ macros.install_packages(ceilometer_ipmi_packages | customizable("packages")) }} + +{% endif %} + +{% block ceilometer_ipmi_footer %}{% endblock %} +{% block footer %}{% endblock %} + +USER ceilometer diff --git a/releasenotes/notes/add-ceilometer-agent-ipmi-container-aa498b90c3d2f326.yaml b/releasenotes/notes/add-ceilometer-agent-ipmi-container-aa498b90c3d2f326.yaml new file mode 100644 index 000000000..9c421f8ff --- /dev/null +++ b/releasenotes/notes/add-ceilometer-agent-ipmi-container-aa498b90c3d2f326.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add ceilometer agent ipmi service image |