diff --git a/defaults/main.yml b/defaults/main.yml index 98498a3..c691e3c 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -62,6 +62,7 @@ cloudkitty_oslomsg_rabbit_quorum_delivery_limit: "{{ oslomsg_rabbit_quorum_deliv cloudkitty_oslomsg_rabbit_quorum_max_memory_bytes: "{{ oslomsg_rabbit_quorum_max_memory_bytes | default(0) }}" # Notify +cloudkitty_oslomsg_notify_configure: "{{ oslomsg_notify_configure | default(False) }}" cloudkitty_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}" cloudkitty_oslomsg_notify_setup_host: >- {{ (cloudkitty_oslomsg_notify_host_group in groups) | ternary(groups[cloudkitty_oslomsg_notify_host_group][0], 'localhost') }} diff --git a/tasks/main.yml b/tasks/main.yml index 6fb9b0b..1a3725b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -87,6 +87,7 @@ _oslomsg_notify_vhost: "{{ cloudkitty_oslomsg_notify_vhost }}" _oslomsg_notify_transport: "{{ cloudkitty_oslomsg_notify_transport }}" _oslomsg_notify_policies: "{{ cloudkitty_oslomsg_notify_policies }}" + _oslomsg_notify_configure: "{{ cloudkitty_oslomsg_notify_configure }}" tags: - always diff --git a/templates/cloudkitty.conf.j2 b/templates/cloudkitty.conf.j2 index 8d7a01a..2c95062 100644 --- a/templates/cloudkitty.conf.j2 +++ b/templates/cloudkitty.conf.j2 @@ -62,6 +62,7 @@ rabbit_quorum_delivery_limit = {{ cloudkitty_oslomsg_rabbit_quorum_delivery_limi rabbit_quorum_max_memory_bytes = {{ cloudkitty_oslomsg_rabbit_quorum_max_memory_bytes }} [oslo_messaging_notifications] +driver = {{ (cloudkitty_oslomsg_notify_configure | bool) | ternary('messagingv2', 'noop') }} transport_url = {{ cloudkitty_oslomsg_notify_transport }}://{% for host in cloudkitty_oslomsg_notify_servers.split(',') %}{{ cloudkitty_oslomsg_notify_userid }}:{{ cloudkitty_oslomsg_notify_password }}@{{ host }}:{{ cloudkitty_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ _cloudkitty_oslomsg_notify_vhost_conf }}{% if cloudkitty_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ cloudkitty_oslomsg_notify_ssl_version }}&ssl_ca_file={{ cloudkitty_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} [output]