diff --git a/defaults/main.yml b/defaults/main.yml index 651c04b2..658d3c15 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -64,6 +64,12 @@ neutron_lib_dir: "{{ neutron_bin | dirname }}/lib/python2.7/site-packages/" # Set the Neutron configuration path neutron_conf_dir: /etc/neutron +# Enable/Disable designate +neutron_designate_enabled: False + +# Notifications topic for designate +neutron_notifications_designate: notifications_designate + # Enable/Disable Ceilometer neutron_ceilometer_enabled: False diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2 index a9e36e9d..86d2f8ad 100644 --- a/templates/neutron.conf.j2 +++ b/templates/neutron.conf.j2 @@ -181,8 +181,16 @@ rabbit_use_ssl = {{ neutron_rabbitmq_use_ssl }} rpc_conn_pool_size = {{ neutron_rpc_conn_pool_size }} # Notifications -{% if neutron_ceilometer_enabled %} +{% if neutron_ceilometer_enabled or neutron_designate_enabled %} [oslo_messaging_notifications] +{% set notification_topics = [] %} +{% if neutron_ceilometer_enabled %} +{% set _ = notification_topics.append('notifications') %} +{% endif %} +{% if neutron_designate_enabled %} +{% set _ = notification_topics.append(neutron_notifications_designate) %} +{% endif %} +notification_topics = {{ notification_topics | join(',') }} driver = messagingv2 transport_url = rabbit://{% for host in neutron_rabbitmq_telemetry_servers.split(',') %}{{ neutron_rabbitmq_telemetry_userid }}:{{ neutron_rabbitmq_telemetry_password }}@{{ host }}:{{ neutron_rabbitmq_telemetry_port }}{% if not loop.last %},{% else %}/{{ neutron_rabbitmq_telemetry_vhost }}{% endif %}{% endfor %} {% endif %}