Merge "swift: Fix the empty gid option in rsyncd.conf"
diff --git a/.zuul.yaml b/.zuul.yaml
index 517e12b..f98107c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -729,16 +729,8 @@
- devstack-multinode
- devstack-unit-tests
- openstack-tox-bashate
- - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa:
- voting: false
- - swift-dsvm-functional:
- voting: false
- irrelevant-files: &dsvm-irrelevant-files
- - ^.*\.rst$
- - ^doc/.*$
- - swift-dsvm-functional-py3:
- voting: false
- irrelevant-files: *dsvm-irrelevant-files
+ - ironic-tempest-bios-ipmi-direct-tinyipa
+ - swift-dsvm-functional
- grenade:
irrelevant-files:
- ^.*\.rst$
@@ -789,6 +781,8 @@
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
+ - ironic-tempest-bios-ipmi-direct-tinyipa
+ - swift-dsvm-functional
- grenade:
irrelevant-files:
- ^.*\.rst$
diff --git a/doc/source/plugin-registry.rst b/doc/source/plugin-registry.rst
index 490132e..4364dd9 100644
--- a/doc/source/plugin-registry.rst
+++ b/doc/source/plugin-registry.rst
@@ -46,7 +46,6 @@
openstack/freezer-api `https://opendev.org/openstack/freezer-api <https://opendev.org/openstack/freezer-api>`__
openstack/freezer-tempest-plugin `https://opendev.org/openstack/freezer-tempest-plugin <https://opendev.org/openstack/freezer-tempest-plugin>`__
openstack/freezer-web-ui `https://opendev.org/openstack/freezer-web-ui <https://opendev.org/openstack/freezer-web-ui>`__
-openstack/glance `https://opendev.org/openstack/glance <https://opendev.org/openstack/glance>`__
openstack/heat `https://opendev.org/openstack/heat <https://opendev.org/openstack/heat>`__
openstack/heat-dashboard `https://opendev.org/openstack/heat-dashboard <https://opendev.org/openstack/heat-dashboard>`__
openstack/ironic `https://opendev.org/openstack/ironic <https://opendev.org/openstack/ironic>`__
diff --git a/lib/nova b/lib/nova
index de91517..f4f4797 100644
--- a/lib/nova
+++ b/lib/nova
@@ -926,6 +926,11 @@
iniset $NOVA_CPU_CONF os_vif_ovs ovsdb_connection "tcp:$OVSDB_SERVER_LOCAL_HOST:6640"
fi
+ # Workaround bug #1939108
+ if [[ "$VIRT_DRIVER" == "libvirt" && "$LIBVIRT_TYPE" == "qemu" ]]; then
+ iniset $NOVA_CPU_CONF workarounds libvirt_disable_apic True
+ fi
+
if [[ "$VIRT_DRIVER" = 'libvirt' ]]; then
# The group **$LIBVIRT_GROUP** is added to the current user in this script.
# ``sg`` is used in run_process to execute nova-compute as a member of the
diff --git a/lib/nova_plugins/functions-libvirt b/lib/nova_plugins/functions-libvirt
index e9ceae4..63882e0 100644
--- a/lib/nova_plugins/functions-libvirt
+++ b/lib/nova_plugins/functions-libvirt
@@ -56,6 +56,17 @@
# Installs required distro-specific libvirt packages.
function install_libvirt {
+ # NOTE(yoctozepto): The common consensus [1] is that libvirt-python should
+ # be installed from distro packages. However, various projects might be
+ # trying to ensure it is installed using pip AND use upper-constraints
+ # with that, causing pip to try to upgrade it and to fail.
+ # The following line removes libvirt-python from upper-constraints and
+ # avoids the situation described above. Now only if installed packages
+ # explicitly depend on a newer (or, in general, incompatible) libvirt-python
+ # version, will pip try to reinstall it.
+ # [1] https://review.opendev.org/c/openstack/devstack/+/798514
+ $REQUIREMENTS_DIR/.venv/bin/edit-constraints \
+ $REQUIREMENTS_DIR/upper-constraints.txt -- libvirt-python
if is_ubuntu; then
install_package qemu-system libvirt-clients libvirt-daemon-system libvirt-dev python3-libvirt