From fde456a4eb4d054e0b6923d9a1aeb0f1f4ccabf7 Mon Sep 17 00:00:00 2001 From: Florian La Roche Date: Fri, 26 Sep 2025 08:57:55 +0200 Subject: [PATCH] commit all local changes Signed-off-by: Florian La Roche --- FUTURE.rst | 2 +- README.rst | 4 ++-- doc/source/configuration.rst | 6 +++--- doc/source/guides/devstack-with-nested-kvm.rst | 2 +- functions-common | 2 +- lib/databases/mysql | 2 +- lib/ldap | 2 +- lib/nova | 7 +------ lib/tempest | 5 +++-- playbooks/tox/pre.yaml | 6 +++--- playbooks/tox/run-both.yaml | 2 +- stack.sh | 2 +- 12 files changed, 19 insertions(+), 23 deletions(-) diff --git a/FUTURE.rst b/FUTURE.rst index 11bea30f0b..e25dea78f5 100644 --- a/FUTURE.rst +++ b/FUTURE.rst @@ -108,6 +108,6 @@ installation to mitigate this. ============================ Devstack started off as an explanation as much as an install -script. We would love contributions to that further enhance the +script. We would love contributions that further enhance the comments and explanations about what is happening, even if it seems a little pedantic at times. diff --git a/README.rst b/README.rst index 86b85da956..176e1c5c39 100644 --- a/README.rst +++ b/README.rst @@ -28,9 +28,9 @@ Versions The DevStack master branch generally points to trunk versions of OpenStack components. For older, stable versions, look for branches named stable/[release] in the DevStack repo. For example, you can do the -following to create a Zed OpenStack cloud:: +following to create a OpenStack 2025.2 cloud:: - git checkout stable/zed + git checkout stable/2025.2 ./stack.sh You can also pick specific OpenStack project releases by setting the appropriate diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst index 3cfba716ca..85badffa66 100644 --- a/doc/source/configuration.rst +++ b/doc/source/configuration.rst @@ -629,7 +629,7 @@ tests can be run as follows: By default tempest is downloaded and the config file is generated, but the tempest package is not installed in the system's global site-packages (the -package install includes installing dependences). So tempest won't run +package install includes installing dependencies). So tempest won't run outside of tox. If you would like to install it add the following to your ``localrc`` section: @@ -726,7 +726,7 @@ it in the configuration of RegionOne. Glance ++++++ -The default image size quota of 1GiB may be too small if larger images +The default image size quota of 2GiB may be too small if larger images are to be used. Change the default at setup time with: :: @@ -802,5 +802,5 @@ Reasoning: built along https://github.com/linux-on-ibm-z/docs/wiki/Building-etcd. .. note:: To run *Tempest* against this *Devstack* all-in-one, you'll need - to use a guest image which is smaller than 1GB when uncompressed. + to use a guest image which is smaller than 2GB when uncompressed. The example image from above is bigger than that! diff --git a/doc/source/guides/devstack-with-nested-kvm.rst b/doc/source/guides/devstack-with-nested-kvm.rst index ba483e9ec9..034bee92c6 100644 --- a/doc/source/guides/devstack-with-nested-kvm.rst +++ b/doc/source/guides/devstack-with-nested-kvm.rst @@ -119,7 +119,7 @@ Ensure DevStack VM is Using KVM Before invoking ``stack.sh`` in the VM, ensure that KVM is enabled. This can be verified by checking for the presence of the file ``/dev/kvm`` in your VM. If it is present, DevStack will default to using the config -attribute ``virt_type = kvm`` in ``/etc/nova.conf``; otherwise, it'll fall +attribute ``virt_type = kvm`` in ``/etc/nova/nova.conf``; otherwise, it'll fall back to ``virt_type=qemu``, i.e. plain QEMU emulation. Optionally, to explicitly set the type of virtualization, to KVM, by the diff --git a/functions-common b/functions-common index 39424e3352..048cfa19d2 100644 --- a/functions-common +++ b/functions-common @@ -468,7 +468,7 @@ declare -g DISTRO function GetDistro { GetOSVersion - if [[ "$os_VENDOR" =~ (Ubuntu) || "$os_VENDOR" =~ (Debian) ]]; then + if [[ "$os_VENDOR" =~ (Ubuntu|Debian) ]]; then # 'Everyone' refers to Ubuntu / Debian releases by # the code name adjective DISTRO=$os_CODENAME diff --git a/lib/databases/mysql b/lib/databases/mysql index 4def1842a7..ab35df04df 100644 --- a/lib/databases/mysql +++ b/lib/databases/mysql @@ -20,7 +20,7 @@ if [[ -z "$MYSQL_SERVICE_NAME" ]]; then MYSQL_SERVICE_NAME=mysql if is_fedora; then MYSQL_SERVICE_NAME=mariadb - elif [[ "$DISTRO" =~ trixie|bookworm|bullseye ]]; then + elif [[ $os_VENDOR =~ (Debian) ]]; then MYSQL_SERVICE_NAME=mariadb fi fi diff --git a/lib/ldap b/lib/ldap index 66c2afc4d5..5f6b33b360 100644 --- a/lib/ldap +++ b/lib/ldap @@ -86,7 +86,7 @@ function init_ldap { # a bug in OpenLDAP 2.6.7+ # (https://bugs.openldap.org/show_bug.cgi?id=10336) causes slapd crash # after deleting nonexisting tree. It is fixed upstream, but Ubuntu is - # still not having a fix in Noble. Try temporarily simly restarting the + # still not having a fix in Noble. Try temporarily simply restarting the # process. sudo service $LDAP_SERVICE_NAME restart fi diff --git a/lib/nova b/lib/nova index 460b4adc85..199477f95d 100644 --- a/lib/nova +++ b/lib/nova @@ -948,7 +948,7 @@ function install_nova { # 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 + # Installing novnc on Debian 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 @@ -1060,11 +1060,6 @@ function start_nova_compute { 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 [[ "$NOVA_CPU_UUID" ]]; then echo -n $NOVA_CPU_UUID > $NOVA_CONF_DIR/compute_id fi diff --git a/lib/tempest b/lib/tempest index 1ebe9c5f1f..d67210ec94 100644 --- a/lib/tempest +++ b/lib/tempest @@ -845,9 +845,10 @@ function install_tempest { # NOTE(gmann): Pinning tox<4.0.0 for stable/zed and lower. Tox 4.0.0 # released after zed was released and has some incompatible changes # and it is ok not to fix the issues caused by tox 4.0.0 in stable - # beanches jobs. We can continue testing the stable/zed and lower + # branches jobs. We can continue testing the stable/zed and lower # branches with tox<4.0.0 - pip_install 'tox!=2.8.0,<4.0.0' + #pip_install 'tox!=2.8.0,<4.0.0' + pip_install tox pushd $TEMPEST_DIR # NOTE(gmann): checkout the TEMPEST_BRANCH in case TEMPEST_BRANCH # is tag name not master. git_clone would not checkout tag because diff --git a/playbooks/tox/pre.yaml b/playbooks/tox/pre.yaml index 68d5254251..850092e7f3 100644 --- a/playbooks/tox/pre.yaml +++ b/playbooks/tox/pre.yaml @@ -8,7 +8,7 @@ # NOTE(gmann): Pinning tox<4.0.0 for stable/zed and lower. Tox 4.0.0 # released after zed was released and has some incompatible changes # and it is ok not to fix the issues caused by tox 4.0.0 in stable - # beanches jobs. We can continue testing the stable/zed and lower + # branches jobs. We can continue testing the stable/zed and lower # branches with tox<4.0.0 - - role: ensure-tox - ensure_tox_version: "<4" + #- role: ensure-tox + # ensure_tox_version: "<4" diff --git a/playbooks/tox/run-both.yaml b/playbooks/tox/run-both.yaml index e4043d8231..b7a6fdb619 100644 --- a/playbooks/tox/run-both.yaml +++ b/playbooks/tox/run-both.yaml @@ -6,6 +6,6 @@ bindep_profile: test bindep_dir: "{{ zuul_work_dir }}" - test-setup - - ensure-tox + #- ensure-tox - get-devstack-os-environment - tox diff --git a/stack.sh b/stack.sh index 965f58007d..8bc9b58fe2 100755 --- a/stack.sh +++ b/stack.sh @@ -229,7 +229,7 @@ write_devstack_version # Warn users who aren't on an explicitly supported distro, but allow them to # override check and attempt installation with ``FORCE=yes ./stack`` -SUPPORTED_DISTROS="trixie|bookworm|jammy|noble|rhel9|rhel10" +SUPPORTED_DISTROS="forky|trixie|bookworm|jammy|noble|rhel9|rhel10" if [[ ! ${DISTRO} =~ $SUPPORTED_DISTROS ]]; then echo "WARNING: this script has not been tested on $DISTRO"