diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-08-01 09:41:17 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2017-08-15 17:17:32 +0800 |
| commit | 17c5123fda995438a2fdba3ec40e6c4cec9c5505 (patch) | |
| tree | 5a4e24fe49236b3af41b18afeeab9b9d39fb2206 /docker/ceilometer | |
| parent | f1842f4fd9cf9c294c23438ee74971c6dc71c4ec (diff) | |
| download | kolla-17c5123fda995438a2fdba3ec40e6c4cec9c5505.tar.gz kolla-17c5123fda995438a2fdba3ec40e6c4cec9c5505.zip | |
libvirt should be installed from OS rather than pip
python-libvirt need be compiled with libvirt header. compiling
it with different libvirt header may be failed.
So better install python-libvirt from OS distro.
Closes-Bug: #1707841
Change-Id: I0d7bf1576aaf24fc7c60f49923e37a6a1afe9a8e
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")) }} |