Skip to content

Commit adc9d8f

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "destroy: fix Octavia interface cleanup permissions" into stable/2025.1
2 parents 4822dba + e7ffb74 commit adc9d8f

2 files changed

Lines changed: 17 additions & 10 deletions

File tree

ansible/roles/destroy/tasks/cleanup_host.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,27 @@
1515
destroy_include_dev: "{{ destroy_include_dev }}"
1616
kolla_ansible_inventories: "{{ ansible_inventory_sources | join(' ') }}"
1717

18-
- block:
18+
- name: Clean up Octavia interface service
19+
become: true
20+
when:
21+
- enable_octavia | bool
22+
- octavia_auto_configure | bool
23+
- octavia_network_type == 'tenant'
24+
- inventory_hostname in groups['octavia-health-manager']
25+
block:
1926
- name: Disable octavia-interface service
20-
service:
27+
ansible.builtin.service:
2128
name: octavia-interface
22-
enabled: no
29+
enabled: false
2330
state: stopped
2431
failed_when: false
2532

2633
- name: Remove octavia-interface service file
27-
file:
34+
ansible.builtin.file:
2835
path: /etc/systemd/system/octavia-interface.service
2936
state: absent
3037

3138
- name: Remove dhclient.conf
32-
file:
39+
ansible.builtin.file:
3340
path: /etc/dhcp/octavia-dhclient.conf
3441
state: absent
35-
when:
36-
- enable_octavia | bool
37-
- octavia_auto_configure | bool
38-
- octavia_network_type == 'tenant'
39-
- inventory_hostname in groups['octavia-health-manager']
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes a failure in the destroy workflow when cleaning up the Octavia
5+
interface service by running the task with elevated privileges.

0 commit comments

Comments
 (0)