From 0b351dc62a4dd46f6fc0d2bba7861864675f60f8 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 18 Oct 2016 14:43:42 +0100 Subject: [PATCH] Work around bad libvirt-python wheel The following package must always build from source: - libvirt-python: A pre-built wheel can be missing libvirt capabilities from the installed version of libvirt-bin, leading to nova-compute failing to start. The pycparser upper constraint override is removed as the patch to make it compatible with upper constraints has merged. Closes-Bug: #1625859 Change-Id: I3197f06839c9705574810ab616dff51924435da5 (cherry picked from commit faf78e457ee2be33fa275c4622067b9220fae903) --- playbooks/inventory/group_vars/repo_all.yml | 9 +++++++++ .../bootstrap-host/templates/user_variables.aio.yml.j2 | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/playbooks/inventory/group_vars/repo_all.yml b/playbooks/inventory/group_vars/repo_all.yml index 093a335859..51b8e50be1 100644 --- a/playbooks/inventory/group_vars/repo_all.yml +++ b/playbooks/inventory/group_vars/repo_all.yml @@ -45,3 +45,12 @@ repo_build_service_group_name: "{{ repo_service_group_name }}" # Disable the pip lock down for the repo servers pip_lock_to_internal_repo: False + +# The following package must always build from source. +# +# libvirt-python: +# A pre-built wheel can be missing libvirt capabilities from the installed +# version of libvirt-bin, leading to nova-compute failing to start. +# +repo_build_pip_no_binary: + - libvirt-python diff --git a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 index 56b704d73b..9d2f49c42c 100644 --- a/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables.aio.yml.j2 @@ -81,10 +81,6 @@ cache_timeout: {{ cache_timeout }} repo_build_git_cache: {{ repo_build_git_cache }} {% endif %} -## Instruct the gate to always build libvirt-python from pip source -repo_build_pip_no_binary: - - libvirt-python - # The container backing store is set to 'overlayfs' to speed up the # AIO build time. lxc_container_backing_store: "{{ ((ansible_kernel | version_compare('3.18.0-0-generic', '<')) or (ansible_distribution_release | lower == 'trusty')) | ternary('dir', 'overlayfs') }}"