Skip to content

Commit 92cb77b

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "libvirt: Stop installing python bindings from pip"
2 parents 4465472 + f0bf2bd commit 92cb77b

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

lib/nova_plugins/functions-libvirt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,10 @@ EOF
5858
function install_libvirt {
5959

6060
if is_ubuntu; then
61-
install_package qemu-system libvirt-clients libvirt-daemon-system libvirt-dev
61+
install_package qemu-system libvirt-clients libvirt-daemon-system libvirt-dev python3-libvirt
6262
if is_arch "aarch64"; then
6363
install_package qemu-efi
6464
fi
65-
# uninstall in case the libvirt version changed
66-
pip_uninstall libvirt-python
67-
pip_install_gr libvirt-python
6865
#pip_install_gr <there-si-no-guestfs-in-pypi>
6966
elif is_fedora || is_suse; then
7067

@@ -79,14 +76,11 @@ function install_libvirt {
7976
# as the base system version is too old. We should have
8077
# pre-installed these
8178
install_package qemu-kvm
79+
install_package libvirt libvirt-devel python3-libvirt
8280

83-
install_package libvirt libvirt-devel
8481
if is_arch "aarch64"; then
8582
install_package edk2.git-aarch64
8683
fi
87-
88-
pip_uninstall libvirt-python
89-
pip_install_gr libvirt-python
9084
fi
9185

9286
if [[ $DEBUG_LIBVIRT_COREDUMPS == True ]]; then

0 commit comments

Comments
 (0)