Merge pull request #852 from stackhpc/upstream/2025.1-2026-03-09

Synchronise 2025.1 with upstream

Author: Alex-Welsh

ansible/roles/loadbalancer/defaults/main.yml

@@ -192,7 +192,7 @@ keepalived_track_script_enabled: True
 # Default backend for single external frontend (for missing mappings)
 haproxy_external_single_frontend_default_backend: "horizon_external_back"
 
-haproxy_external_single_frontend_public_port: "443"
+haproxy_single_external_frontend_public_port: "443"
 
 haproxy_external_single_frontend_options:
   - option httplog

ansible/roles/loadbalancer/templates/haproxy/haproxy_external_frontend.cfg.j2

@@ -7,6 +7,6 @@ frontend external_frontend
     {{ http_option }}
 {% endfor %}
     http-request set-header X-Forwarded-Proto https if { ssl_fc }
-    bind {{ kolla_external_vip_address }}:{{ haproxy_external_single_frontend_public_port }} {{ external_tls_bind_info }}
+    bind {{ kolla_external_vip_address }}:{{ haproxy_single_external_frontend_public_port }} {{ external_tls_bind_info }}
     use_backend %[req.hdr(host),lower,map_dom(/etc/haproxy/external-frontend-map,{{ haproxy_external_single_frontend_default_backend }})]
     http-request deny if { path -i -m beg /server-status }

ansible/roles/prometheus/defaults/main.yml

@@ -197,7 +197,7 @@ prometheus_node_exporter_targets_extra: []
 # For a list of default endpoints see
 # prometheus_blackbox_exporter_endpoints_default.
 # For a list of modules see the alertmanager config.
-prometheus_blackbox_exporter_endpoints: "{{ prometheus_blackbox_exporter_endpoints_default | selectattr('enabled', 'true') | map(attribute='endpoints') | flatten | union(prometheus_blackbox_exporter_endpoints_custom) | unique | select | list }}"
+prometheus_blackbox_exporter_endpoints: "{{ prometheus_blackbox_exporter_endpoints_default | selectattr('enabled', 'true') | map(attribute='endpoints') | flatten | union(prometheus_blackbox_exporter_endpoints_custom) | unique | select | list | sort }}"
 
 prometheus_blackbox_exporter_endpoints_default:
   # OpenStack endpoints

doc/requirements.txt

@@ -10,3 +10,6 @@ reno>=3.1.0 # Apache-2.0
 sphinx>=2.0.0,!=2.1.0 # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
 whereto>=0.3.0 # Apache-2.0
+# NOTE(bbezak): pin setuptools
+# https://setuptools.pypa.io/en/stable/history.html#v82-0-0
+setuptools==81.0

releasenotes/notes/work-around-incompatible-bcypt-version-e5dc29e13a1b313e.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix generating passwords longer than 72 characters. This fixes prometheus
+    configuration. `LP#2126975 <https://bugs.launchpad.net/kolla/+bug/2126975>`__

requirements.txt

@@ -1,5 +1,5 @@
 # Password hashing
-bcrypt>=3.0.0 # Apache-2.0
+bcrypt>=4.0.1,<5 # Apache-2.0
 
 # password generation
 cryptography>=2.1 # BSD/Apache-2.0

tests/templates/globals-default.j2

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

zuul.d/project.yaml

@@ -2,7 +2,10 @@
 - project:
     queue: kolla
     templates:
-      - check-requirements
+      # NOTE(bbezak): requirement check disabled due to
+      # setuptools pin.
+      # https://setuptools.pypa.io/en/stable/history.html#v82-0-0
+      # - check-requirements
       - openstack-cover-jobs
       - ansible-role-jobs
       - publish-openstack-docs-pti