diff options
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 5 |
2 files changed, 6 insertions, 8 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")) }} diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 906c8f2b0..2e24b8a49 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -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' ] %} |