Merge "Customizations for ceilometer"

1 files changed, 8 insertions, 9 deletions

diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
index 8896dc562..dabeeafa8 100644
--- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2
@@ -1,22 +1,21 @@
 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-notification \
-  && yum clean all
-
+        {% set ceilometer_notification_packages = ['openstack-ceilometer-notification'] %}
     {% elif base_distro in ['ubuntu'] %}
+        {% set ceilometer_notification_packages = ['ceilometer-agent-notification'] %}
+    {% endif %}
 
-RUN apt-get -y install --no-install-recommends \
-        ceilometer-agent-notification \
-    && apt-get clean
+RUN {{ macros.install_packages(ceilometer_notification_packages | customizable("packages")) }}
 
-    {% endif %}
 {% endif %}
 
+{% block ceilometer_notification_footer %}{% endblock %}
+{% block footer %}{% endblock %}
 {{ include_footer }}
 
 USER ceilometer