diff options
| author | Martin Falatic <mfalatic@cisco.com> | 2016-07-25 12:53:12 -0700 |
|---|---|---|
| committer | Martin Falatic <mfalatic@cisco.com> | 2016-07-25 22:31:48 -0700 |
| commit | cfa5b36e533b355ce8e475c28f65f93454778a98 (patch) | |
| tree | 57ec3495870e92a316cc893141f8a21112e08b67 /docker/ceilometer/ceilometer-api | |
| parent | 73ac202563e05f9cc623964f6d3124242a79d888 (diff) | |
| download | kolla-cfa5b36e533b355ce8e475c28f65f93454778a98.tar.gz kolla-cfa5b36e533b355ce8e475c28f65f93454778a98.zip | |
Customizations for ceilometer
This patchset contains customization of Dockerfile of ceilometer containers
Change-Id: Iee8db7e105fbd8c3d5c947dd3b7c5e0ca7c49b78
Partially-implements: blueprint third-party-plugin-support
Diffstat (limited to 'docker/ceilometer/ceilometer-api')
| -rw-r--r-- | docker/ceilometer/ceilometer-api/Dockerfile.j2 | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 9d363498f..e80f3f7cf 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -1,25 +1,24 @@ FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} MAINTAINER {{ maintainer }} +{% import "macros.j2" as macros with context %} + {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum -y install \ - openstack-ceilometer-api \ - && yum clean all - + {% set ceilometer_api_packages = ['openstack-ceilometer-api'] %} {% elif base_distro in ['ubuntu'] %} + {% set ceilometer_api_packages = ['ceilometer-api'] %} + {% endif %} -RUN apt-get -y install --no-install-recommends \ - ceilometer-api \ - && apt-get clean +RUN {{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }} - {% endif %} {% endif %} COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start +{% block ceilometer_api_footer %}{% endblock %} +{% block footer %}{% endblock %} {{ include_footer }} USER ceilometer |