From 771cb5c8ed0b28201abc7e016f05ba64a84f3763 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Fri, 8 May 2026 15:19:12 +0200 Subject: [PATCH 1/2] horizon: rebuild static assets after theme changes Include the theme directory in settings_bundle so theme-only changes invalidate the cache and rebuild the static assets. Closes-Bug: #2148389 Change-Id: If4fbc24c5c339f7dee7bf67a09fc6448ede0c9fd Signed-off-by: Grzegorz Koper (cherry picked from commit 21cacdd855bca15be846d392ec6795d667bf8ac1) --- docker/horizon/extend_start.sh | 3 ++- .../notes/horizon-theme-rebuilds-65e5f50c1d0cc8dd.yaml | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/horizon-theme-rebuilds-65e5f50c1d0cc8dd.yaml diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 63a40189df..506c503c55 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -209,7 +209,8 @@ function settings_bundle { tar -cf- --mtime=1970-01-01 \ /etc/openstack-dashboard/local_settings \ /etc/openstack-dashboard/custom_local_settings \ - /etc/openstack-dashboard/local_settings.d 2> /dev/null || true + /etc/openstack-dashboard/local_settings.d \ + /etc/openstack-dashboard/themes 2> /dev/null || true } function settings_changed { diff --git a/releasenotes/notes/horizon-theme-rebuilds-65e5f50c1d0cc8dd.yaml b/releasenotes/notes/horizon-theme-rebuilds-65e5f50c1d0cc8dd.yaml new file mode 100644 index 0000000000..a85f1e5f4f --- /dev/null +++ b/releasenotes/notes/horizon-theme-rebuilds-65e5f50c1d0cc8dd.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Fixed Horizon static asset regeneration for custom theme updates. + Changes under ``/etc/openstack-dashboard/themes`` now invalidate the + startup settings hash, so Horizon reruns ``collectstatic`` and + ``compress`` after a restart or recreate. From 7a0a400f32d4d45dc78d29dcedaf8e31c47b07ef Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 11 Jun 2025 10:50:28 +0200 Subject: [PATCH 2/2] rabbitmq: Improve healthcheck script output We've seen multiple occassions of all these healthcheck commands not being able to be executed in 30s after the switch to RMQ 4.1. Let's put more information in the Docker/Podman healthcheck logs. Change-Id: I4b1b54983144f5514a6703c255d2cb4fa052a0fb (cherry picked from commit bbe23bd107c16d4990b26e9aca5eb888f98cc781) Signed-off-by: Maksim Malchuk --- docker/rabbitmq/rabbitmq/healthcheck_rabbitmq | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/docker/rabbitmq/rabbitmq/healthcheck_rabbitmq b/docker/rabbitmq/rabbitmq/healthcheck_rabbitmq index 529362bace..277ab098c3 100644 --- a/docker/rabbitmq/rabbitmq/healthcheck_rabbitmq +++ b/docker/rabbitmq/rabbitmq/healthcheck_rabbitmq @@ -2,9 +2,7 @@ set -e -rabbitmq-diagnostics -t 5 -q ping || exit 1 -rabbitmq-diagnostics -t 5 -q status || exit 1 -rabbitmq-diagnostics -t 5 -q check_running || exit 1 -rabbitmq-diagnostics -t 5 -q check_local_alarms || exit 1 -rabbitmq-diagnostics -t 5 -q check_port_connectivity || exit 1 -rabbitmq-diagnostics -t 5 -q check_virtual_hosts || exit 1 +for check in ping status check_running check_local_alarms check_port_connectivity check_virtual_hosts; do + echo "Running rabbitmq-diagnostics $check" + rabbitmq-diagnostics -t 5 -q $check || (echo "ERROR: $check failed" && exit 1) +done