openstack/devstack
Code Issues Proposed changes

Do not use libvirt-bin package anymore

Browse Source 
The package libvirt-bin is a transitional package in Debian and should
not be used anymore.

Ubuntu Xenial is an exception here.

Because of that this change also adds the possibility to use "not:" to
exclude distros in files/debs/* just as "dist:" limits distros.

Depends-On: Icc59ea79f54d4ff8751f2e353ee3530fff3d961e
Closes-Bug: #1673840
Change-Id: I3998a7178d14ec40eae5cb199d66da9546cd6ccf
This commit is contained in:
David Rabel 2017-03-17 19:19:00 +01:00
parent dab52d7554
commit 682e0abe1a
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/debs/nova
View File

@ -10,7 +10,9 @@ iputils-arping
kpartx kpartx
libjs-jquery-tablesorter # Needed for coverage html reports libjs-jquery-tablesorter # Needed for coverage html reports
libmysqlclient-dev libmysqlclient-dev
libvirt-bin # NOPRIME libvirt-bin # dist:xenial NOPRIME
libvirt-clients # not:xenial NOPRIME
libvirt-daemon-system # not:xenial NOPRIME
libvirt-dev # NOPRIME libvirt-dev # NOPRIME
mysql-server # NOPRIME mysql-server # NOPRIME
parted parted

15
functions-common
View File

@ -1148,6 +1148,19 @@ function _parse_package_files {
fi fi
fi fi
# Look for # not:xxx in comment
if [[ $line =~ (.*)#.*not:([^ ]*) ]]; then
# We are using BASH regexp matching feature.
package=${BASH_REMATCH[1]}
distros=${BASH_REMATCH[2]}
# In bash ${VAR,,} will lowercase VAR
# Look for a match in the distro list
if [[ ${distros,,} =~ ${DISTRO,,} ]]; then
# If match then skip this package
inst_pkg=0
fi
fi
if [[ $inst_pkg = 1 ]]; then if [[ $inst_pkg = 1 ]]; then
echo $package echo $package
fi fi
@ -1166,6 +1179,8 @@ function _parse_package_files {
# - ``# NOPRIME`` defers installation to be performed later in `stack.sh` # - ``# NOPRIME`` defers installation to be performed later in `stack.sh`
# - ``# dist:DISTRO`` or ``dist:DISTRO1,DISTRO2`` limits the selection # - ``# dist:DISTRO`` or ``dist:DISTRO1,DISTRO2`` limits the selection
# of the package to the distros listed. The distro names are case insensitive. # of the package to the distros listed. The distro names are case insensitive.
# - ``# not:DISTRO`` or ``not:DISTRO1,DISTRO2`` limits the selection
# of the package to the distros not listed. The distro names are case insensitive.
function get_packages { function get_packages {
local xtrace local xtrace
xtrace=$(set +o | grep xtrace) xtrace=$(set +o | grep xtrace)

6
lib/nova_plugins/functions-libvirt
View File

@ -24,7 +24,11 @@ DEBUG_LIBVIRT=$(trueorfalse True DEBUG_LIBVIRT)
function install_libvirt { function install_libvirt {
if is_ubuntu; then if is_ubuntu; then
install_package qemu-system install_package qemu-system
install_package libvirt-bin libvirt-dev if [[ ${DISTRO} == "xenial" ]]; then
install_package libvirt-bin libvirt-dev
else
install_package libvirt-clients libvirt-daemon-system libvirt-dev
fi
pip_install_gr libvirt-python pip_install_gr libvirt-python
if [[ ${DISTRO} == "trusty" && ${EBTABLES_RACE_FIX} == "True" ]]; then if [[ ${DISTRO} == "trusty" && ${EBTABLES_RACE_FIX} == "True" ]]; then
# Work around for bug #1501558. We can remove this once we # Work around for bug #1501558. We can remove this once we