Merge pull request #808 from stackhpc/upstream/2025.1-2025-10-27

Synchronise 2025.1 with upstream

Author: priteau

ansible/group_vars/all.yml

@@ -465,8 +465,9 @@ heat_api_cfn_public_port: "{{ haproxy_single_external_frontend_public_port if ha
 
 horizon_internal_fqdn: "{{ kolla_internal_fqdn }}"
 horizon_external_fqdn: "{{ kolla_external_fqdn }}"
-horizon_internal_endpoint: "{{ kolla_internal_fqdn | kolla_url(internal_protocol, horizon_tls_port if kolla_enable_tls_internal | bool else horizon_port) }}"
-horizon_public_endpoint: "{{ kolla_external_fqdn | kolla_url(public_protocol, horizon_tls_port if kolla_enable_tls_external | bool else horizon_port) }}"
+horizon_internal_endpoint: "{{ horizon_internal_fqdn | kolla_url(internal_protocol, horizon_tls_port if kolla_enable_tls_internal | bool else horizon_port) }}"
+horizon_public_endpoint: "{{ horizon_external_fqdn | kolla_url(public_protocol, horizon_tls_port if kolla_enable_tls_external | bool else horizon_port) }}"
+
 horizon_port: "80"
 horizon_tls_port: "443"
 horizon_listen_port: "{{ horizon_tls_port if horizon_enable_tls_backend | bool else horizon_port }}"

ansible/roles/octavia/defaults/main.yml

@@ -270,6 +270,15 @@ octavia_ks_users:
     password: "{{ octavia_keystone_password }}"
     role: "admin"
 
+####################
+# Notification
+####################
+octavia_notification_topics:
+  - name: notifications
+    enabled: "{{ enable_ceilometer | bool }}"
+
+octavia_enabled_notification_topics: "{{ octavia_notification_topics | selectattr('enabled', 'equalto', true) | list }}"
+
 ####################
 # Kolla
 ####################

ansible/roles/octavia/templates/octavia.conf.j2

@@ -122,6 +122,12 @@ rpc_thread_pool_size = 2
 
 [oslo_messaging_notifications]
 transport_url = {{ notify_transport_url }}
+{% if octavia_enabled_notification_topics %}
+driver = messagingv2
+topics = {{ octavia_enabled_notification_topics | map(attribute='name') | join(',') }}
+{% else %}
+driver = noop
+{% endif %}
 
 [oslo_messaging_rabbit]
 use_queue_manager = true

releasenotes/notes/fix-horizon-glance-cors-55e2e83902662c99.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes an issue where CORS can be blocked when attempting
+    to upload an image via the Horizon user interface.

releasenotes/notes/octavia-notifications-98a91ab02d9cbee6.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Adds a missing override for ``octavia_notification_topics`` so that
+    operators can add their own notification topics for Octavia. By
+    default it will send notifications to ceilometer when ceilometer
+    is enabled.