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
This commit is contained in:
Jeffrey Zhang 2017-08-01 09:41:17 +08:00
parent f1842f4fd9
commit 17c5123fda
2 changed files with 6 additions and 8 deletions
docker
ceilometer/ceilometer-compute
nova/nova-compute

@ -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")) }}

@ -70,7 +70,7 @@ RUN rm -f /etc/nova/nova-compute.conf
'e2fsprogs',
'genisoimage',
'iscsi-initiator-utils',
'libvirt-devel',
'libvirt-python',
'libosinfo',
'nfs-utils',
'openvswitch',
@ -89,10 +89,10 @@ RUN rm -f /etc/nova/nova-compute.conf
'e2fsprogs',
'genisoimage',
'libosinfo-bin',
'libvirt-dev',
'nfs-common',
'open-iscsi',
'python-libguestfs',
'python-libvirt',
'qemu-utils'
] %}
@ -116,7 +116,6 @@ RUN mkdir -p /etc/ceph
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
{% set nova_compute_pip_packages = [
'libvirt-python',
'oslo-vmware'
]
%}