openstack/openstack-ansible-os_zun
Code Issues Proposed changes

Merge "Add variable to globally control notifications enablement"

Browse Source
This commit is contained in:
Zuul 2024-05-28 09:26:24 +00:00 committed by Gerrit Code Review
commit 494b7d2f10
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -177,6 +177,7 @@ zun_oslomsg_rpc_ssl_ca_file: "{{ oslomsg_rpc_ssl_ca_file | default('') }}"
zun_oslomsg_rpc_policies: []
# Notify
zun_oslomsg_notify_configure: "{{ oslomsg_notify_configure | default(zun_ceilometer_enabled or zun_designate_enabled) }}"
zun_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}"
zun_oslomsg_notify_setup_host: "{{ (zun_oslomsg_notify_host_group in groups) | ternary(groups[zun_oslomsg_notify_host_group][0], 'localhost') }}"
zun_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}"

1
tasks/main.yml
View File

@ -106,6 +106,7 @@
_oslomsg_notify_transport: "{{ zun_oslomsg_notify_transport }}"
_oslomsg_configure_notify: "{{ (zun_ceilometer_enabled | bool) or (zun_designate_enabled | bool) }}"
_oslomsg_notify_policies: "{{ zun_oslomsg_notify_policies }}"
_oslomsg_notify_configure: "{{ zun_oslomsg_notify_configure }}"
tags:
- always

4
templates/zun.conf.j2
View File

@ -88,9 +88,9 @@ lock_path = {{ zun_lock_dir }}/{{ zun_system_slice_name }}
[oslo_messaging_notifications]
driver = {{ (zun_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }}
driver = {{ (zun_oslomsg_notify_configure | bool) | ternary('messagingv2', 'noop') }}
transport_url = {{ zun_oslomsg_notify_transport }}://{% for host in zun_oslomsg_notify_servers.split(',') %}{{ zun_oslomsg_notify_userid }}:{{ zun_oslomsg_notify_password }}@{{ host }}:{{ zun_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ _zun_oslomsg_notify_vhost_conf }}{% if zun_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ zun_oslomsg_notify_ssl_version }}&ssl_ca_file={{ zun_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
{% if zun_ceilometer_enabled or zun_designate_enabled %}
{% if zun_oslomsg_notify_configure %}
{% set notification_topics = [] %}
{% if zun_ceilometer_enabled %}
{% set _ = notification_topics.append('notifications') %}