Synchronise 2025.1 with upstream

ansible/roles/destroy/tasks/cleanup_host.yml

@@ -15,25 +15,27 @@
     destroy_include_dev: "{{ destroy_include_dev }}"
     kolla_ansible_inventories: "{{ ansible_inventory_sources | join(' ') }}"
 
-- block:
+- name: Clean up Octavia interface service
+  become: true
+  when:
+    - enable_octavia | bool
+    - octavia_auto_configure | bool
+    - octavia_network_type == 'tenant'
+    - inventory_hostname in groups['octavia-health-manager']
+  block:
     - name: Disable octavia-interface service
-      service:
+      ansible.builtin.service:
         name: octavia-interface
-        enabled: no
+        enabled: false
         state: stopped
       failed_when: false
 
     - name: Remove octavia-interface service file
-      file:
+      ansible.builtin.file:
         path: /etc/systemd/system/octavia-interface.service
         state: absent
 
     - name: Remove dhclient.conf
-      file:
+      ansible.builtin.file:
         path: /etc/dhcp/octavia-dhclient.conf
         state: absent
-  when:
-    - enable_octavia | bool
-    - octavia_auto_configure | bool
-    - octavia_network_type == 'tenant'
-    - inventory_hostname in groups['octavia-health-manager']

doc/source/reference/logging-and-monitoring/prometheus-guide.rst

@@ -239,7 +239,7 @@ For example:
   :caption: ``/etc/kolla/globals.yml``
 
   prometheus_node_exporter_targets_extra:
-    - target: http://10.0.0.1:1234
+    - target: 10.0.0.1:1234
       labels:
         instance: host1
 

releasenotes/notes/fix-octavia-interface-cleanup-68ce51b85f005f9a.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes a failure in the destroy workflow when cleaning up the Octavia
+    interface service by running the task with elevated privileges.