commit c9a9e415b9a955525a407b78650f93e9193c8117
author Clark Boylan <clark.boylan@gmail.com> Wed Mar 29 10:28:55 2017 -0700
committer Clark Boylan <clark.boylan@gmail.com> Tue Apr 11 14:32:44 2017 -0700
tree ada6fe098ff5d961bbfbb4aa662f45d9358d5974
parent def07b21f86ee70cae223785f0195c91de1f2b64

Test using UCA for libvirt 2.5.0

We have had issues with libvirt 1.3.1 which is stock on Xenial. Try
using 2.5.0 from UCA instead.

Related-Bug: 1643911
Related-Bug: 1646779
Related-Bug: 1638982
Change-Id: Ia4434541c71f050fe1ffb54f4c4c1e302391d00b

stackrc

diff --git a/stackrc b/stackrc
index b53f791..fc03f49 100644
--- a/stackrc
+++ b/stackrc
@@ -599,8 +599,12 @@
 case "$VIRT_DRIVER" in
     ironic|libvirt)
         LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm}
-        if [[ "$os_VENDOR" =~ (Debian) ]]; then
-            LIBVIRT_GROUP=libvirt
+        if [[ "$os_VENDOR" =~ (Debian|Ubuntu) ]]; then
+            # The groups change with newer libvirt. Older Ubuntu used
+            # 'libvirtd', but now uses libvirt like Debian. Do a quick check
+            # to see if libvirtd group already exists to handle grenade's case.
+            LIBVIRT_GROUP=$(cut -d ':' -f 1 /etc/group | grep 'libvirtd$' || true)
+            LIBVIRT_GROUP=${LIBVIRT_GROUP:-libvirt}
         else
             LIBVIRT_GROUP=libvirtd
         fi