openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Drop designate notifications topic"

Browse Source
This commit is contained in:
Zuul 2021-12-06 10:54:29 +00:00 committed by Gerrit Code Review
commit 8752d02a9f
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
defaults/main.yml
View File

@ -315,9 +315,6 @@ neutron_allow_reverse_dns_lookup: True
neutron_ipv4_ptr_zone_prefix_size: 24
neutron_ipv6_ptr_zone_prefix_size: 116
# Notifications topic for designate
neutron_notifications_designate: notifications_designate
###
### Plugins Loading
###
@ -330,7 +327,7 @@ neutron_notifications_designate: notifications_designate
# - vpnaas
# - metering
# - qos
# - dns/subnet_dns_publish_fixed_ip either one or the other, not both
# - dns/dns_domain_ports/subnet_dns_publish_fixed_ip either one or the other, not both
# - port_forwarding
neutron_plugin_base:
- router

3
templates/neutron.conf.j2
View File

@ -228,9 +228,6 @@ rpc_conn_pool_size = {{ neutron_rpc_conn_pool_size }}
{% if neutron_ceilometer_enabled %}
{% set _ = notification_topics.append('notifications') %}
{% endif %}
{% if neutron_designate_enabled %}
{% set _ = notification_topics.append(neutron_notifications_designate) %}
{% endif %}
topics = {{ notification_topics | join(',') }}
driver = {{ (notification_topics | length > 0) | ternary('messagingv2', 'noop') }}
transport_url = {{ neutron_oslomsg_notify_transport }}://{% for host in neutron_oslomsg_notify_servers.split(',') %}{{ neutron_oslomsg_notify_userid }}:{{ neutron_oslomsg_notify_password }}@{{ host }}:{{ neutron_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ neutron_oslomsg_notify_vhost }}{% if neutron_oslomsg_notify_use_ssl | bool %}?ssl=1&ssl_version={{ neutron_oslomsg_notify_ssl_version }}&ssl_ca_file={{ neutron_oslomsg_notify_ssl_ca_file }}{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}