Merge "Fix code format ceilometer_compute dockerfile"

openstack · Jan 29, 2017 · 4abfeba · 4abfeba
2 parents db26a7a + a021dea
commit 4abfeba
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
@@ -18,24 +18,20 @@ MAINTAINER {{ maintainer }}
             'python-libvirt'
          ] %}
     {% endif %}
-
 {{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
-
-RUN yum -y install \
-        libvirt-devel \
-    && yum clean all
-
+        {% set ceilometer_compute_packages = [
+            'libvirt-devel'
+         ] %}
     {% elif base_distro in ['ubuntu', 'debian'] %}
-
-RUN apt-get -y install --no-install-recommends \
-        libvirt-dev \
-    && apt-get clean
-
+        {% set ceilometer_compute_packages = [
+            'libvirt-dev'
+         ] %}
     {% endif %}
 
+{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
 RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt libvirt-python
 
 {% endif %}