From 87e9df59aa29381bd741bfdc5c3a76e258f0c107 Mon Sep 17 00:00:00 2001 From: Rafal Lewandowski Date: Thu, 4 Dec 2025 16:50:28 +0100 Subject: [PATCH 1/2] Fix for Prometheus documentation Closes-Bug: #2102239 Change-Id: Ia8e551c62fc5d2d775098026d5d85611b81934fc Signed-off-by: Rafal Lewandowski (cherry picked from commit ef7b06716dbd7de439d6504331c9c77481c047c2) --- .../reference/logging-and-monitoring/prometheus-guide.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/reference/logging-and-monitoring/prometheus-guide.rst b/doc/source/reference/logging-and-monitoring/prometheus-guide.rst index c8fc066ece..6c67680bf1 100644 --- a/doc/source/reference/logging-and-monitoring/prometheus-guide.rst +++ b/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 From e7ffb746bc64251ee0dbde5b44bf92881587298f Mon Sep 17 00:00:00 2001 From: "Shapovalov, Pavel" Date: Wed, 4 Mar 2026 14:09:02 +0300 Subject: [PATCH 2/2] destroy: fix Octavia interface cleanup permissions The destroy task 'Clean up Octavia interface service' requires root privileges to remove the systemd service file. Without privilege escalation the task fails, causing the destroy workflow to stop. Add become: true to ensure the task runs with the required permissions. Closes-Bug: #2143078 Change-Id: If3c005b076f6e086cdb2f83dab954c77bd81d888 Signed-off-by: Shapovalov, Pavel (cherry picked from commit 50cd2d35adc327431f0ae7ac34c4adec2700e537) --- ansible/roles/destroy/tasks/cleanup_host.yml | 22 ++++++++++--------- ...ia-interface-cleanup-68ce51b85f005f9a.yaml | 5 +++++ 2 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 releasenotes/notes/fix-octavia-interface-cleanup-68ce51b85f005f9a.yaml diff --git a/ansible/roles/destroy/tasks/cleanup_host.yml b/ansible/roles/destroy/tasks/cleanup_host.yml index 96389564f2..f6bb5854c6 100644 --- a/ansible/roles/destroy/tasks/cleanup_host.yml +++ b/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'] diff --git a/releasenotes/notes/fix-octavia-interface-cleanup-68ce51b85f005f9a.yaml b/releasenotes/notes/fix-octavia-interface-cleanup-68ce51b85f005f9a.yaml new file mode 100644 index 0000000000..c0df2c01ab --- /dev/null +++ b/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.