Merge "Add RBAC scope and new defaults setting support for Nova & Tempest"
diff --git a/.zuul.yaml b/.zuul.yaml
index 56acb37..ce38760 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -678,8 +678,6 @@
description: Debian Bullseye platform test
nodeset: devstack-single-node-debian-bullseye
timeout: 9000
- # TODO(danms) n-v until the known issue is resolved
- voting: false
vars:
configure_swap_size: 4096
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index 776ef1d..a83b2de 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -751,7 +751,7 @@
::
- openstack --os-cloud devstack-system-admin registered limit update \
+ openstack --os-cloud devstack-system-admin registered limit set \
--service glance --default-limit 5000 --region RegionOne image_size_total
.. _arch-configuration:
diff --git a/lib/nova b/lib/nova
index 63c6a86..14eb8fc 100644
--- a/lib/nova
+++ b/lib/nova
@@ -921,8 +921,23 @@
# a websockets/html5 or flash powered VNC console for vm instances
NOVNC_FROM_PACKAGE=$(trueorfalse False NOVNC_FROM_PACKAGE)
if [ "$NOVNC_FROM_PACKAGE" = "True" ]; then
+ # Installing novnc on Debian bullseye breaks the global pip
+ # install. This happens because novnc pulls in distro cryptography
+ # which will be prefered by distro pip, but if anything has
+ # installed pyOpenSSL from pypi (keystone) that is not compatible
+ # with distro cryptography. Fix this by installing
+ # python3-openssl (pyOpenSSL) from the distro which pip will prefer
+ # on Debian. Ubuntu has inverse problems so we only do this for
+ # Debian.
+ local novnc_packages
+ novnc_packages="novnc"
+ GetOSVersion
+ if [[ "$os_VENDOR" = "Debian" ]] ; then
+ novnc_packages="$novnc_packages python3-openssl"
+ fi
+
NOVNC_WEB_DIR=/usr/share/novnc
- install_package novnc
+ install_package $novnc_packages
else
NOVNC_WEB_DIR=$DEST/novnc
git_clone $NOVNC_REPO $NOVNC_WEB_DIR $NOVNC_BRANCH