Merge pull request #891 from stackhpc/upstream/2025.1-2026-06-22

Synchronise 2025.1 with upstream

Author: priteau

ansible/group_vars/all.yml

@@ -640,7 +640,7 @@ ovn_sb_db_port: "6642"
 ovn_sb_db_relay_count: "{{ ((groups['ovn-controller'] | length) / ovn_sb_db_relay_compute_per_relay | int) | round(0, 'ceil') | int }}"
 ovn_sb_db_relay_compute_per_relay: "50"
 ovn_sb_db_relay_port_prefix: "1664"
-ovn_sb_db_relay_port: "{{ ovn_sb_db_relay_port_prefix ~ ovn_sb_db_relay_client_group_id }}"
+ovn_sb_db_relay_port: "{{ (ovn_sb_db_relay_port_prefix | int) * 10 + (ovn_sb_db_relay_client_group_id | int) }}"
 ovn_sb_db_relay_client_group_id: "{{ range(1, ovn_sb_db_relay_count | int + 1) | random(seed=inventory_hostname) }}"
 ovn_nb_connection: "{% for host in groups['ovn-nb-db'] %}tcp:{{ 'api' | kolla_address(host) | put_address_in_context('url') }}:{{ ovn_nb_db_port }}{% if not loop.last %},{% endif %}{% endfor %}"
 ovn_sb_connection: "{{ ovn_sb_connection_relay if enable_ovn_sb_db_relay | bool else ovn_sb_connection_no_relay }}"

ansible/roles/ovn-db/tasks/bootstrap-db.yml

@@ -83,8 +83,7 @@
 
 - name: Wait for ovn-sb-db-relay
   vars:
-    ovn_sb_db_relay_group_id: "{{ item }}"
-    ovn_sb_db_relay_port: "{{ ovn_sb_db_relay_port_prefix ~ ovn_sb_db_relay_group_id }}"
+    ovn_sb_db_relay_port: "{{ (ovn_sb_db_relay_port_prefix | int) * 10 + (item | int) }}"
   wait_for:
     host: "{{ api_interface_address }}"
     port: "{{ ovn_sb_db_relay_port }}"

ansible/roles/ovn-db/tasks/config-relay.yml

@@ -24,6 +24,7 @@
   vars:
     # NOTE(mnasiadka): Used in the ovn_sb_relay_command template in defaults/main.yml
     ovn_sb_db_relay_group_id: "{{ item }}"
+    ovn_sb_db_relay_port: "{{ (ovn_sb_db_relay_port_prefix | int) * 10 + (item | int) }}"
   template:
     src: "ovsdb-relay.json.j2"
     dest: "{{ node_config_directory }}/ovn-sb-db-relay-{{ item }}/ovsdb-relay.json"

ansible/roles/ovn-db/templates/ovsdb-relay.json.j2

@@ -1,7 +1,7 @@
 
 {
     "remotes": {
-        "ptcp:{{ ovn_sb_db_relay_port_prefix ~ ovn_sb_db_relay_group_id }}:{{ api_interface_address | put_address_in_context('url') }}": {
+        "ptcp:{{ ovn_sb_db_relay_port }}:{{ api_interface_address | put_address_in_context('url') }}": {
             "inactivity-probe": {{ ovn_sb_db_relay_passive_inactivity_probe }}
         }
     },

ansible/roles/rabbitmq/tasks/restart_services.yml

@@ -7,15 +7,24 @@
     name: "rabbitmq"
   register: container_info
 
-- name: Put RabbitMQ node into maintenance mode
+- name: Put RabbitMQ node into maintenance mode if in cluster
   kolla_toolbox:
     container_engine: "{{ kolla_container_engine }}"
     module_name: "community.rabbitmq.rabbitmq_upgrade"
     module_args:
       action: "drain"
     user: root
   become: true
-  when: container_info.containers | length > 0
+  when:
+    - container_info.containers | length > 0
+    - groups['rabbitmq'] | length > 1
+
+- name: Stop the RabbitMQ application if not in cluster
+  become: true
+  command: "{{ kolla_container_engine }} exec rabbitmq rabbitmqctl stop_app"
+  when:
+    - container_info.containers | length > 0
+    - groups['rabbitmq'] | length == 1
 
 - name: Restart rabbitmq container
   vars:

doc/source/reference/storage/external-ceph-guide.rst

@@ -555,6 +555,15 @@ This prevents cross-project and public object access. This can be resolved by
 setting ``ceph_rgw_swift_account_in_url`` to ``true``. This should match the
 ``rgw_swift_account_in_url`` configuration option in Ceph RadosGW.
 
+.. warning::
+
+   When using an external Ceph RadosGW for object storage endpoints
+   (when ``enable_ceph_rgw: true``), operators are advised to set
+   ``update_keystone_service_user_passwords: false`` in``globals.yml``.
+   Leaving this option enabled causes the service user password to be reset
+   on every reconfigure, which invalidates existing tokens and can cause
+   unforeseen outages for object storage consumers.
+
 Load balancing
 ==============
 

releasenotes/notes/bug-2111916-6b2ca611df41dceb.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes invalid use of ``drain`` on single-node RabbitMQ setups
+    by using ``stop_app`` instead.
+    `LP#2111916 <https://launchpad.net/bugs/2111916>`__

tests/templates/globals-default.j2

@@ -204,7 +204,7 @@ libvirt_tls: "yes"
 neutron_plugin_agent: "ovn"
 neutron_ovn_distributed_fip: "yes"
 neutron_enable_ovn_agent: "yes"
-ovn_sb_db_relay_count: "3"
+ovn_sb_db_relay_count: "11"
 enable_octavia: "yes"
 octavia_provider_drivers: "ovn:OVN provider"
 octavia_provider_agents: "ovn"