openstack/openstack-ansible-os_heat
Code Issues Proposed changes

Add variable to globally control notifications enablement

Browse Source 
In order to be able to globally enable notification reporting for all services,
without an need to have ceilometer deployed or bunch of overrides for each
service, we add `oslomsg_notify_enabled` variable that aims to control
behaviour of enabled notifications.

Presence of ceilometer is still respected by default and being referenced.

Potential usecase are various billing panels that do rely on notifications
but do not require presence of Ceilometer.

Depends-On: https://review.opendev.org/c/openstack/openstack-ansible-plugins/+/914144
Change-Id: If017f0bc80b2424fef20551580fba6bb0d1feba5
This commit is contained in:
Dmitriy Rabotyagov 2024-04-23 19:53:22 +02:00
parent eb02bf5724
commit e012bfab48
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@ -96,6 +96,7 @@ heat_oslomsg_rpc_ssl_version: "{{ oslomsg_rpc_ssl_version | default('TLSv1_2') }
heat_oslomsg_rpc_ssl_ca_file: "{{ oslomsg_rpc_ssl_ca_file | default('') }}"
# Notify
heat_oslomsg_notify_configure: "{{ oslomsg_notify_configure | default(heat_ceilometer_enabled) }}"
heat_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}"
heat_oslomsg_notify_setup_host: "{{ (heat_oslomsg_notify_host_group in groups) | ternary(groups[heat_oslomsg_notify_host_group][0], 'localhost') }}"
heat_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}"

1
tasks/main.yml
View File

@ -95,6 +95,7 @@
_oslomsg_notify_vhost: "{{ heat_oslomsg_notify_vhost }}"
_oslomsg_notify_transport: "{{ heat_oslomsg_notify_transport }}"
_oslomsg_notify_policies: "{{ heat_oslomsg_notify_policies }}"
_oslomsg_notify_configure: "{{ heat_oslomsg_notify_configure }}"
tags:
- always

2
templates/heat.conf.j2
View File

@ -75,7 +75,7 @@ enable_proxy_headers_parsing = True
# Ceilometer options
[oslo_messaging_notifications]
driver = {{ (heat_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }}
driver = {{ (heat_oslomsg_notify_configure | bool) | ternary('messagingv2', 'noop') }}
transport_url = {{ heat_oslomsg_notify_transport }}://{% for host in heat_oslomsg_notify_servers.split(',') %}{{ heat_oslomsg_notify_userid }}:{{ heat_oslomsg_notify_password }}@{{ host }}:{{ heat_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ _heat_oslomsg_notify_vhost_conf }}{% if heat_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ heat_oslomsg_notify_ssl_version }}&ssl_ca_file={{ heat_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}