Skip to content

Commit 999955d

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Do not write octavia_amp_ssh_key if auto_config disabled" into stable/victoria
2 parents 9d8bd03 + 326e15d commit 999955d

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

ansible/roles/octavia/tasks/config.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,9 @@
9090
group: "{{ config_owner_group }}"
9191
mode: "0400"
9292
become: True
93-
when: inventory_hostname in groups[octavia_services['octavia-worker']['group']]
93+
when:
94+
- inventory_hostname in groups[octavia_services['octavia-worker']['group']]
95+
- octavia_auto_configure | bool
9496

9597
- name: Copying certificate files for octavia-worker
9698
vars:
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes an issue with Octavia SSH key copying if user disabled Octavia
5+
auto configuration.
6+
`LP##1927727 <https://bugs.launchpad.net/kolla-ansible/+bug/1927727>`__

0 commit comments

Comments
 (0)