Only install libvirt if the driver is libvirt(!)

Ib85769e9a3470bede836ac0b87861ce76c0aedcf broke other drivers by force-installing
libvirt.  Only seen when we rebased the CI on the latest devstack-gate.

Change-Id: I99f5dbf8f0af8bdb2b76fb6834b20a96344dfa7d
This commit is contained in:
Bob Ball
2014-04-01 09:58:41 +01:00
parent 15042a0c2a
commit f9d905d439

View File

@@ -347,10 +347,12 @@ function setup_host {
# Detect OS type
# Ubuntu has an lsb_release command which allows us to detect if it is Ubuntu
if lsb_release -i 2>/dev/null | grep -iq ubuntu
then
# Temporary work around to install a patched libvirt 0.9.8+
enable_latest_libvirt
if [ "$DEVSTACK_GATE_VIRT_DRIVER" == "libvirt" ]; then
if lsb_release -i 2>/dev/null | grep -iq ubuntu
then
# Temporary work around to install a patched libvirt 0.9.8+
enable_latest_libvirt
fi
fi
# Move the PIP cache into position: