diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index eacc99390..76298e062 100644 --- 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 %} |
