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/nova | |
| 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/nova')
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 5 |
1 files changed, 2 insertions, 3 deletions
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' ] %} |