Skip to content

Commit d63160a

Browse files
committed
Enables override of Octavia notification topics
Octavia was missing an override for enabling notification topics, this aligns the overrides with how all the other project roles handle the topic. Closes-Bug: #2087997 Change-Id: Icbe25c0f4107128db899c0111af3acf3c513008f Signed-off-by: Antony Messerli <[email protected]> (cherry picked from commit 41b4166)
1 parent 7e64447 commit d63160a

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

ansible/roles/octavia/defaults/main.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,15 @@ octavia_ks_users:
270270
password: "{{ octavia_keystone_password }}"
271271
role: "admin"
272272

273+
####################
274+
# Notification
275+
####################
276+
octavia_notification_topics:
277+
- name: notifications
278+
enabled: "{{ enable_ceilometer | bool }}"
279+
280+
octavia_enabled_notification_topics: "{{ octavia_notification_topics | selectattr('enabled', 'equalto', true) | list }}"
281+
273282
####################
274283
# Kolla
275284
####################

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,12 @@ rpc_thread_pool_size = 2
122122

123123
[oslo_messaging_notifications]
124124
transport_url = {{ notify_transport_url }}
125+
{% if octavia_enabled_notification_topics %}
126+
driver = messagingv2
127+
topics = {{ octavia_enabled_notification_topics | map(attribute='name') | join(',') }}
128+
{% else %}
129+
driver = noop
130+
{% endif %}
125131

126132
[oslo_messaging_rabbit]
127133
use_queue_manager = true
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
fixes:
3+
- |
4+
Adds a missing override for ``octavia_notification_topics`` so that
5+
operators can add their own notification topics for Octavia. By
6+
default it will send notifications to ceilometer when ceilometer
7+
is enabled.

0 commit comments

Comments
 (0)