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
(cherry picked from commit 17c5123fda)

docker/ceilometer/ceilometer-compute/Dockerfile.j2

@@ -23,16 +23,15 @@ MAINTAINER {{ maintainer }}
 {% elif install_type == 'source' %}
     {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
         {% set ceilometer_compute_packages = [
-            'libvirt-devel'
+            'libvirt-python'
          ] %}
     {% elif base_distro in ['ubuntu', 'debian'] %}
         {% set ceilometer_compute_packages = [
-            'libvirt-dev'
+            'python-libvirt'
          ] %}
     {% 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 %}
 

docker/nova/nova-compute/Dockerfile.j2

@@ -49,7 +49,7 @@ RUN rm -f /etc/nova/nova-compute.conf
 
         {% set nova_compute_packages = [
             'dosfstools',
-            'libvirt-devel',
+            'libvirt-python',
             'libosinfo',
             'openvswitch',
             'qemu-img',
@@ -67,13 +67,13 @@ RUN rm -f /etc/nova/nova-compute.conf
         {% set nova_compute_packages = [
             'dosfstools',
             'libosinfo-bin',
-            'libvirt-dev',
             'qemu-utils',
             'ceph-common',
             'genisoimage',
             'nfs-common',
             'open-iscsi',
             'targetcli',
+            'python-libvirt',
             'python-rtslib'
         ] %}
 
@@ -83,10 +83,7 @@ RUN mkdir -p /etc/ceph
 
 {{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
 
-{% set nova_compute_pip_packages = [
-        'libvirt-python'
-    ]
-%}
+{% set nova_compute_pip_packages = [] %}
 
 {{ macros.install_pip(nova_compute_pip_packages | customizable("pip_packages")) }}