diff --git a/defaults/main.yml b/defaults/main.yml index 59a7dde..3c493d8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -113,6 +113,7 @@ designate_oslomsg_rpc_ssl_ca_file: "{{ oslomsg_rpc_ssl_ca_file | default('') }}" designate_oslomsg_rpc_policies: [] # Notify +designate_oslomsg_notify_configure: "{{ oslomsg_notify_configure | default(designate_ceilometer_enabled) }}" designate_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}" designate_oslomsg_notify_setup_host: >- {{ (designate_oslomsg_notify_host_group in groups) | ternary(groups[designate_oslomsg_notify_host_group][0], 'localhost') }} diff --git a/tasks/main.yml b/tasks/main.yml index 66ff291..13e4a2e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -88,6 +88,7 @@ _oslomsg_notify_transport: "{{ designate_oslomsg_notify_transport }}" _oslomsg_configure_notify: "{{ designate_ceilometer_enabled | bool }}" _oslomsg_notify_policies: "{{ designate_oslomsg_notify_policies }}" + _oslomsg_notify_configure: "{{ designate_oslomsg_notify_configure }}" tags: - always diff --git a/templates/designate.conf.j2 b/templates/designate.conf.j2 index 2eae5cd..56c8cff 100644 --- a/templates/designate.conf.j2 +++ b/templates/designate.conf.j2 @@ -36,7 +36,7 @@ rabbit_quorum_delivery_limit = {{ designate_oslomsg_rabbit_quorum_delivery_limit rabbit_quorum_max_memory_bytes = {{ designate_oslomsg_rabbit_quorum_max_memory_bytes }} [oslo_messaging_notifications] -driver = {{ (designate_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }} +driver = {{ (designate_oslomsg_notify_configure | bool) | ternary('messagingv2', 'noop') }} transport_url = {{ designate_oslomsg_notify_transport }}://{% for host in designate_oslomsg_notify_servers.split(',') %}{{ designate_oslomsg_notify_userid }}:{{ designate_oslomsg_notify_password }}@{{ host }}:{{ designate_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ _designate_oslomsg_notify_vhost_conf }}{% if designate_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ designate_oslomsg_notify_ssl_version }}&ssl_ca_file={{ designate_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %} {% if designate_backend_ssl | bool %}