Merge "Only install libvirt if the driver is libvirt(!)"

2014-04-01 23:05:48 +00:00
parent bb97a63816 f9d905d439
commit 2d9530da77
1 changed files with 6 additions and 4 deletions
--- a/functions.sh
+++ b/functions.sh
@@ -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: