This updates the UCA usage from Pike to Queens. As a result,
the various volume multiattach checks can also be removed
because the Queens UCA has libvirt 4.0.0.
Change-Id: Icb971831c8d4fe5f940d9e7993d53f1c3765e30f
... | ... |
@@ -625,12 +625,7 @@ VIRT_DRIVER=${VIRT_DRIVER:-$DEFAULT_VIRT_DRIVER} |
625 | 625 |
case "$VIRT_DRIVER" in |
626 | 626 |
ironic|libvirt) |
627 | 627 |
LIBVIRT_TYPE=${LIBVIRT_TYPE:-kvm} |
628 |
- # If ENABLE_VOLUME_MULTIATTACH is True, the Ubuntu Cloud Archive can't |
|
629 |
- # be used until it provides libvirt>=3.10, and with older versions of |
|
630 |
- # Ubuntu the group is "libvirtd". |
|
631 |
- # TODO(mriedem): Remove the ENABLE_VOLUME_MULTIATTACH check when |
|
632 |
- # UCA has libvirt>=3.10. |
|
633 |
- if [[ "$os_VENDOR" =~ (Debian|Ubuntu) && "${ENABLE_VOLUME_MULTIATTACH}" == "False" ]]; then |
|
628 |
+ if [[ "$os_VENDOR" =~ (Debian|Ubuntu) ]]; then |
|
634 | 629 |
# The groups change with newer libvirt. Older Ubuntu used |
635 | 630 |
# 'libvirtd', but now uses libvirt like Debian. Do a quick check |
636 | 631 |
# to see if libvirtd group already exists to handle grenade's case. |
... | ... |
@@ -77,28 +77,23 @@ function fixup_keystone { |
77 | 77 |
# Make it possible to switch this based on an environment variable as |
78 | 78 |
# libvirt 2.5.0 doesn't handle nested virtualization quite well and this |
79 | 79 |
# is required for the trove development environment. |
80 |
-# The Pike UCA has qemu 2.10 but libvirt 3.6, therefore if |
|
81 |
-# ENABLE_VOLUME_MULTIATTACH is True, we can't use the Pike UCA |
|
82 |
-# because multiattach won't work with those package versions. |
|
83 |
-# We can remove this check when the UCA has libvirt>=3.10. |
|
84 | 80 |
function fixup_uca { |
85 |
- if [[ "${ENABLE_UBUNTU_CLOUD_ARCHIVE}" == "False" || "$DISTRO" != "xenial" || \ |
|
86 |
- "${ENABLE_VOLUME_MULTIATTACH}" == "True" ]]; then |
|
81 |
+ if [[ "${ENABLE_UBUNTU_CLOUD_ARCHIVE}" == "False" || "$DISTRO" != "xenial" ]]; then |
|
87 | 82 |
return |
88 | 83 |
fi |
89 | 84 |
|
90 | 85 |
# This pulls in apt-add-repository |
91 | 86 |
install_package "software-properties-common" |
92 |
- # Use UCA for newer libvirt. Should give us libvirt 2.5.0. |
|
87 |
+ # Use UCA for newer libvirt. |
|
93 | 88 |
if [[ -f /etc/ci/mirror_info.sh ]] ; then |
94 | 89 |
# If we are on a nodepool provided host and it has told us about where |
95 | 90 |
# we can find local mirrors then use that mirror. |
96 | 91 |
source /etc/ci/mirror_info.sh |
97 | 92 |
|
98 |
- sudo apt-add-repository -y "deb $NODEPOOL_UCA_MIRROR xenial-updates/pike main" |
|
93 |
+ sudo apt-add-repository -y "deb $NODEPOOL_UCA_MIRROR xenial-updates/queens main" |
|
99 | 94 |
else |
100 | 95 |
# Otherwise use upstream UCA |
101 |
- sudo add-apt-repository -y cloud-archive:pike |
|
96 |
+ sudo add-apt-repository -y cloud-archive:queens |
|
102 | 97 |
fi |
103 | 98 |
|
104 | 99 |
# Disable use of libvirt wheel since a cached wheel build might be |