openstack
/
openstack-ansible-os_cinder
Code Issues Proposed changes

Add variable to globally control notifications enablement 

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: Ifb16270b41eb795dca9b4bd6a1a3e6eabf2f45eb
This commit is contained in:
Dmitriy Rabotyagov 2024-03-25 16:18:48 +01:00 committed by Dmitriy Rabotyagov
parent 5ad37dd620
commit 21f8ede972
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

@ -110,6 +110,7 @@ cinder_oslomsg_rpc_ssl_version: "{{ oslomsg_rpc_ssl_version | default('TLSv1_2')
cinder_oslomsg_rpc_ssl_ca_file: "{{ oslomsg_rpc_ssl_ca_file | default('') }}"
# Notify
cinder_oslomsg_notify_configure: "{{ oslomsg_notify_configure | default(cinder_ceilometer_enabled) }}"
cinder_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}"
cinder_oslomsg_notify_setup_host: "{{ (cinder_oslomsg_notify_host_group in groups) | ternary(groups[cinder_oslomsg_notify_host_group][0], 'localhost') }}"
cinder_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}"

1
tasks/main.yml
View File

@ -81,6 +81,7 @@
_oslomsg_rpc_vhost: "{{ cinder_oslomsg_rpc_vhost }}"
_oslomsg_rpc_transport: "{{ cinder_oslomsg_rpc_transport }}"
_oslomsg_rpc_policies: "{{ cinder_oslomsg_rpc_policies }}"
_oslomsg_notify_configure: "{{ cinder_oslomsg_notify_configure }}"
_oslomsg_notify_setup_host: "{{ cinder_oslomsg_notify_setup_host }}"
_oslomsg_notify_userid: "{{ cinder_oslomsg_notify_userid }}"
_oslomsg_notify_password: "{{ cinder_oslomsg_notify_password }}"

2
templates/cinder.conf.j2
View File

@ -133,7 +133,7 @@ rabbit_quorum_delivery_limit = {{ cinder_oslomsg_rabbit_quorum_delivery_limit }}
rabbit_quorum_max_memory_bytes = {{ cinder_oslomsg_rabbit_quorum_max_memory_bytes }}
[oslo_messaging_notifications]
driver = {{ (cinder_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }}
driver = {{ (cinder_oslomsg_notify_configure | bool) | ternary('messagingv2', 'noop') }}
transport_url = {{ cinder_oslomsg_notify_transport }}://{% for host in cinder_oslomsg_notify_servers.split(',') %}{{ cinder_oslomsg_notify_userid }}:{{ cinder_oslomsg_notify_password }}@{{ host }}:{{ cinder_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ _cinder_oslomsg_notify_vhost_conf }}{% if cinder_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ cinder_oslomsg_notify_ssl_version }}&ssl_ca_file={{ cinder_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
[oslo_concurrency]