Merge "Customizations for ceilometer"

1 files changed, 13 insertions, 13 deletions

diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 717739b34..3e105906d 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2
@@ -1,24 +1,24 @@
 FROM {{ namespace }}/{{ image_prefix }}openstack-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-common \
-        python-tooz \
-        python-oslo-db \
-    && yum clean all
-
+        {% set ceilometer_base_packages = [
+            'openstack-ceilometer-common',
+            'python-tooz',
+            'python-oslo-db'
+         ] %}
     {% elif base_distro in ['ubuntu'] %}
-
-RUN apt-get -y install --no-install-recommends \
-        ceilometer-common \
-        python-pymongo \
-    && apt-get clean
-
+        {% set ceilometer_base_packages = [
+            'ceilometer-common',
+            'python-pymongo'
+         ] %}
     {% endif %}
 
+RUN {{ macros.install_packages(ceilometer_base_packages | customizable("packages")) }}
+
 {% elif install_type == 'source' %}
 
 ADD ceilometer-base-archive /ceilometer-base-source