Merge pull request #898 from stackhpc/upstream/master-2026-07-07

Synchronise master with upstream

Author: Alex-Welsh

ansible/roles/glance/tasks/config.yml

@@ -53,6 +53,7 @@
     project_services: "{{ glance_services }}"
     service: "{{ glance_services['glance-api'] }}"
     service_name: "glance-api"
+    service_uwsgi_config_chunked_input_limit: "{{ '64M' | human_to_bytes }}"
     service_uwsgi_config_http_port: "{{ glance_api_listen_port }}"
     service_uwsgi_config_log_file_chmod: "644"
     service_uwsgi_config_module: "{{ service.wsgi }}"

ansible/roles/prometheus/defaults/main.yml

@@ -60,7 +60,8 @@ prometheus_services:
         auth_pass: "{{ prometheus_alertmanager_password }}"
         active_passive: "{{ prometheus_alertmanager_active_passive | bool }}"
         backend_http_extra:
-          - "option httpchk"
+          - "option httpchk GET /-/healthy"
+          - "http-check expect status 200"
       prometheus_alertmanager_external:
         enabled: "{{ enable_prometheus_alertmanager_external | bool }}"
         mode: "http"
@@ -72,7 +73,8 @@ prometheus_services:
         auth_pass: "{{ prometheus_alertmanager_password }}"
         active_passive: "{{ prometheus_alertmanager_active_passive | bool }}"
         backend_http_extra:
-          - "option httpchk"
+          - "option httpchk GET /-/healthy"
+          - "http-check expect status 200"
   prometheus-openstack-exporter:
     container_name: "prometheus_openstack_exporter"
     group: "prometheus-openstack-exporter"

ansible/roles/service-uwsgi-config/templates/uwsgi.ini.j2

@@ -1,6 +1,9 @@
 [uwsgi]
 add-header = Connection: close
 buffer-size = 65535
+{% if service_uwsgi_config_chunked_input_limit is defined %}
+chunked-input-limit = {{ service_uwsgi_config_chunked_input_limit }}
+{% endif %}
 die-on-term = true
 enable-threads = true
 exit-on-reload = false

releasenotes/notes/HAProxy-Alertmanager-health-checks-83f260e6ba8b8254.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Added HAProxy HTTP health checks for Prometheus
+    Alertmanager using the ``/-/healthy`` endpoint.
+    HAProxy now verifies HTTP 200 responses to improve
+    backend health detection.

releasenotes/notes/bug-2158974-8a585c20e4dbff1f.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed instance snapshot hanging indefinitely.
+    `LP#2158974 <https://launchpad.net/bugs/2158974>`__