openstack/openstack-ansible-os_ceilometer
Code Issues Proposed changes

Add support for Magnum notifications

Browse Source 
Ceilometer is currently missing configuration for Magnum
which can result in unconsumed queues if Magnum is deployed.

Change-Id: If85c163dde83475f7126b0ecdeebebcfd0720a0a
This commit is contained in:
Andrew Bonney 2024-09-02 09:01:50 +01:00
parent 6180a6511b
commit 8b5c109e8a
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
defaults/main.yml
View File

@ -264,6 +264,21 @@ trove_oslomsg_notify_vhost: >-
trove_oslomsg_notify_ssl_version: "{{ oslomsg_rpc_ssl_version | default('TLSv1_2') }}"
trove_oslomsg_notify_ssl_ca_file: "{{ oslomsg_rpc_ssl_ca_file | default('') }}"
# Magnum notifications
magnum_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}"
magnum_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}"
magnum_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}"
magnum_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}"
magnum_oslomsg_notify_userid: "{{ magnum_oslomsg_rpc_userid | default('magnum') }}"
magnum_oslomsg_notify_password: "{{ magnum_ceilometer_enabled | ternary(magnum_oslomsg_rpc_password, '') }}"
magnum_oslomsg_notify_vhost: >-
{{
magnum_oslomsg_rpc_vhost | default(
(magnum_oslomsg_rabbit_quorum_queues | default(oslomsg_rabbit_quorum_queues | default(True)) | bool) | ternary('magnum', '/magnum'))
}}
magnum_oslomsg_notify_ssl_version: "{{ oslomsg_rpc_ssl_version | default('TLSv1_2') }}"
magnum_oslomsg_notify_ssl_ca_file: "{{ oslomsg_rpc_ssl_ca_file | default('') }}"
## (Qdrouterd) info
# TODO(ansmith): Change structure when more backends will be supported
ceilometer_oslomsg_amqp1_enabled: "{{ ceilometer_oslomsg_rpc_transport == 'amqp' }}"
@ -299,6 +314,7 @@ octavia_ceilometer_enabled: "{{ (groups['octavia_all'] is defined) and (groups['
sahara_ceilometer_enabled: "{{ (groups['sahara_all'] is defined) and (groups['sahara_all'] | length > 0) }}"
swift_ceilometer_enabled: "{{ (groups['swift_all'] is defined) and (groups['swift_all'] | length > 0) }}"
trove_ceilometer_enabled: "{{ (groups['trove_all'] is defined) and (groups['trove_all'] | length > 0) }}"
magnum_ceilometer_enabled: "{{ (groups['magnum_all'] is defined) and (groups['magnum_all'] | length > 0) }}"
# Enable/Disable Telemetry partner services in Ceilometer
# Defaults to True if the service is deployed.

6
releasenotes/notes/add-magnum-integration-a7a21c4feae9cbeb.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Add support for ceilometer consumption of magnum notifications.
Notifications will be consumed automatically when magnum_ceilometer_enabled
is True.

5
templates/ceilometer.conf.j2
View File

@ -111,6 +111,11 @@ messaging_urls = {{ _oslomsg_url(swift_oslomsg_notify_transport, swift_oslomsg_n
# Trove notifications
messaging_urls = {{ _oslomsg_url(trove_oslomsg_notify_transport, trove_oslomsg_notify_userid, trove_oslomsg_notify_password, groups[trove_oslomsg_notify_host_group], trove_oslomsg_notify_port, trove_oslomsg_notify_vhost, trove_oslomsg_notify_use_ssl, trove_oslomsg_notify_ssl_version, trove_oslomsg_notify_ssl_ca_file) }}
{% endif %}
{% if magnum_ceilometer_enabled %}
# Magnum notifications
messaging_urls = {{ _oslomsg_url(magnum_oslomsg_notify_transport, magnum_oslomsg_notify_userid, magnum_oslomsg_notify_password, groups[magnum_oslomsg_notify_host_group], magnum_oslomsg_notify_port, magnum_oslomsg_notify_vhost, magnum_oslomsg_notify_use_ssl, magnum_oslomsg_notify_ssl_version, magnum_oslomsg_notify_ssl_ca_file) }}
{% endif %}
{% endif %}
[publisher]