From 6323ae7706d34494060d9ab50e21c282dcb80b27 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Thu, 3 Feb 2022 16:21:56 +0000 Subject: [PATCH] Revert "Install libvirt-python from source instead of a wheel" This reverts commit 79c8418ead5ead97494497b998aa6c03e27b87bf. Reason for revert: hopefully no longer needed. Change-Id: I17becbd7848e42ce51c2176cff886f23f35364f4 --- .../tasks/prepare_libvirt.yml | 12 ++---------- .../libvirt-not-importable-c8e88a8ef11a1f09.yaml | 5 ----- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 releasenotes/notes/libvirt-not-importable-c8e88a8ef11a1f09.yaml diff --git a/playbooks/roles/bifrost-create-vm-nodes/tasks/prepare_libvirt.yml b/playbooks/roles/bifrost-create-vm-nodes/tasks/prepare_libvirt.yml index 29b9e459a..e990269f9 100644 --- a/playbooks/roles/bifrost-create-vm-nodes/tasks/prepare_libvirt.yml +++ b/playbooks/roles/bifrost-create-vm-nodes/tasks/prepare_libvirt.yml @@ -22,24 +22,16 @@ - default_boot_mode != 'uefi' - test_vm_secure_boot | bool -- name: install gunicorn and lxml +- name: install libvirt-python, gunicorn and lxml include_role: name: bifrost-pip-install vars: package: "{{ item }}" loop: + - libvirt-python - gunicorn - lxml -- name: install libvirt-python - include_role: - name: bifrost-pip-install - vars: - package: libvirt-python - # FIXME(dtantsur): libvirt-python 7.5.0 cannot be used when installed from - # a wheel, force a source installation - extra_args: --no-binary libvirt-python - - name: configure libvirt log filters for qemu blockinfile: path: /etc/libvirt/libvirtd.conf diff --git a/releasenotes/notes/libvirt-not-importable-c8e88a8ef11a1f09.yaml b/releasenotes/notes/libvirt-not-importable-c8e88a8ef11a1f09.yaml deleted file mode 100644 index e6d25a353..000000000 --- a/releasenotes/notes/libvirt-not-importable-c8e88a8ef11a1f09.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -fixes: - - | - Works around the ``libvirt module is not importable`` error by installing - libvirt-python from source install of a wheel.