diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-08-16 07:43:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-08-16 07:43:46 +0000 |
| commit | 88300a99343bb731418c82db2c149b4b791bb268 (patch) | |
| tree | a75ebc74ef12608f923227c705a7fef5399408e7 /docker/ceilometer | |
| parent | 675dd71f66fd28c031551db4b932f0ab1d09675d (diff) | |
| parent | 17c5123fda995438a2fdba3ec40e6c4cec9c5505 (diff) | |
| download | kolla-88300a99343bb731418c82db2c149b4b791bb268.tar.gz kolla-88300a99343bb731418c82db2c149b4b791bb268.zip | |
Merge "libvirt should be installed from OS rather than pip"
Diffstat (limited to 'docker/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 4c07f2135..1de43c9ca 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -23,19 +23,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif install_type == 'source' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ceilometer_compute_packages = [ - 'libvirt-devel' + 'libvirt-python' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set ceilometer_compute_packages = [ - 'libvirt-dev' + 'python-libvirt' ] %} {% endif %} {{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }} -{% set ceilometer_compute_pip_packages = [ - 'libvirt-python' -] %} +# NOTE(jeffrey4l): just for back compatibility +{% set ceilometer_compute_pip_packages = [] %} RUN {{ macros.install_pip(ceilometer_compute_pip_packages | customizable("pip_packages")) }} |