From 50c7edb9d8c5383303207026d30b4badc0c5f398 Mon Sep 17 00:00:00 2001
From: Jim Rollenhagen <jim@jimrollenhagen.com>
Date: Mon, 23 Apr 2018 11:52:55 -0400
Subject: [PATCH] Only install libvirt-python and python-lxml via pip

These are required by the ansible net_virt module, and also virtualbmc.
As such, they will be upgraded when virtualbmc is installed. Pip 10 will
not allow this, if are already installed by the system package manager.
Let's only ever install them via pip as that's the version we want in
the end anyway.

Change-Id: Ia209f22170905a5acd23eeb82cbdec9a537bf80b
---
 playbooks/roles/bifrost-create-vm-nodes/README.md        | 2 --
 .../defaults/required_defaults_CentOS.yml                | 2 --
 .../defaults/required_defaults_Debian.yml                | 2 --
 .../defaults/required_defaults_Fedora.yml                | 2 --
 .../defaults/required_defaults_RedHat.yml                | 2 --
 .../defaults/required_defaults_Suse.yml                  | 2 --
 .../bifrost-create-vm-nodes/tasks/prepare_libvirt.yml    | 9 +++++++++
 7 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/playbooks/roles/bifrost-create-vm-nodes/README.md b/playbooks/roles/bifrost-create-vm-nodes/README.md
index ed0acd45a..f301cf1b1 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/README.md
+++ b/playbooks/roles/bifrost-create-vm-nodes/README.md
@@ -11,8 +11,6 @@ The following packages are required and ensured to be present:
 - qemu-utils
 - qemu-kvm
 - sgabios
-- python-libvirt
-- python-lxml
 
 
 Warning
diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml
index 1dc0e5d26..e9732fc70 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml
@@ -21,8 +21,6 @@ required_packages:
  - libvirt-daemon-driver-secret
  - libvirt-daemon-driver-storage
  - libvirt-daemon-kvm
- - libvirt-python
- - python-lxml
  - pkgconfig
  - libvirt-devel
 test_vm_emulator: "/bin/qemu-system-x86_64"
diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Debian.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Debian.yml
index 7dbb9cbca..895b53ab7 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Debian.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Debian.yml
@@ -7,7 +7,5 @@ required_packages:
  - qemu-kvm
  - qemu-system-x86
  - sgabios
- - python-libvirt
- - python-lxml
  - pkg-config
  - libvirt-dev
diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Fedora.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Fedora.yml
index dca6b9b2d..6a5ef12bb 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Fedora.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Fedora.yml
@@ -9,8 +9,6 @@ required_packages:
  - libvirt
  - libvirt-client
  - libvirt-daemon
- - libvirt-python
- - python-lxml
  - pkgconfig
  - libvirt-devel
  - libselinux-python
diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_RedHat.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_RedHat.yml
index e09f48ff2..62c725310 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_RedHat.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_RedHat.yml
@@ -11,7 +11,5 @@ required_packages:
  - libvirt
  - libvirt-client
  - libvirt-daemon
- - libvirt-python
- - python-lxml
  - pkgconfig
  - libvirt-devel
diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Suse.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Suse.yml
index 71d01340f..78f3ea1a7 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Suse.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Suse.yml
@@ -9,7 +9,5 @@ required_packages:
  - libvirt
  - libvirt-client
  - libvirt-daemon
- - libvirt-python
- - python-lxml
  - pkg-config
  - libvirt-devel
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 7a4144187..b4b925443 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/tasks/prepare_libvirt.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/tasks/prepare_libvirt.yml
@@ -15,6 +15,15 @@
 # Setup libvirt - ensure network and storage pool are defined and active,
 # prepare dir for vm logs
 ---
+- name: install libvirt-python and lxml
+  pip:
+    name: "{{ item }}"
+    extra_args: "-c {{ upper_constraints_file }}"
+    virtualenv: "{{ enable_venv | bool | ternary(bifrost_venv_dir, omit) }}"
+  with_items:
+    - libvirt-python
+    - lxml
+
 - name: "Restart libvirt service"
   service: name="{{libvirt_service_name}}" state=restarted