diff options
| author | zhubingbing <zhu.bingbing@99cloud.net> | 2017-01-27 13:03:35 +0000 |
|---|---|---|
| committer | zhubingbing <zhu.bingbing@99cloud.net> | 2017-01-28 08:21:11 +0000 |
| commit | a021deaaf0ab147f585089450bac951543b84c76 (patch) | |
| tree | fcd4a1afc08c1f00e1b10658c52dd05de6ea5dbc /docker/ceilometer | |
| parent | 32a7b22de70d93b44c7f09dcf3c73199c3cc0fec (diff) | |
| download | kolla-a021deaaf0ab147f585089450bac951543b84c76.tar.gz kolla-a021deaaf0ab147f585089450bac951543b84c76.zip | |
Fix code format ceilometer_compute dockerfile
Change-Id: Ia35a39f34adbba66af1bd1983cfc54e5d165bb90
Diffstat (limited to 'docker/ceilometer')
| -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 %} |
