Update messaging configuration

This patch removes  the conditional inclusion of messaging sections
of the service configuration.

The patch conidtionally selects the notifier driver.

Change-Id: If7b8ebe285614e7140b11631d8665bdfd1acece7
This commit is contained in:
Andy Smith 2018-09-21 08:17:34 -04:00
parent be2efdb49e
commit cdf1c02364
2 changed files with 1 additions and 7 deletions

View File

@ -110,13 +110,11 @@
_oslomsg_rpc_password: "{{ keystone_oslomsg_rpc_password }}"
_oslomsg_rpc_vhost: "{{ keystone_oslomsg_rpc_vhost }}"
_oslomsg_rpc_transport: "{{ keystone_oslomsg_rpc_transport }}"
_oslomsg_configure_rpc: "{{ keystone_messaging_enabled | bool }}"
_oslomsg_notify_setup_host: "{{ keystone_oslomsg_notify_setup_host }}"
_oslomsg_notify_userid: "{{ keystone_oslomsg_notify_userid }}"
_oslomsg_notify_password: "{{ keystone_oslomsg_notify_password }}"
_oslomsg_notify_vhost: "{{ keystone_oslomsg_notify_vhost }}"
_oslomsg_notify_transport: "{{ keystone_oslomsg_notify_transport }}"
_oslomsg_configure_notify: "{{ keystone_ceilometer_enabled | bool }}"
tags:
- common-mq
- keystone-config

View File

@ -17,18 +17,14 @@ secure_proxy_ssl_header = {{ keystone_secure_proxy_ssl_header }}
{% endif %}
## Oslo.Messaging RPC
{% if keystone_messaging_enabled | bool %}
transport_url = {{ keystone_oslomsg_rpc_transport }}://{% for host in keystone_oslomsg_rpc_servers.split(',') %}{{ keystone_oslomsg_rpc_userid }}:{{ keystone_oslomsg_rpc_password }}@{{ host }}:{{ keystone_oslomsg_rpc_port }}{% if not loop.last %},{% else %}/{{ keystone_oslomsg_rpc_vhost }}{% if keystone_oslomsg_rpc_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
[oslo_messaging_rabbit]
ssl = {{ keystone_oslomsg_rpc_use_ssl }}
{% endif %}
{% if keystone_ceilometer_enabled %}
[oslo_messaging_notifications]
driver = messagingv2
driver = {% if keystone_ceilometer_enabled %}messagingv2{% else %}noop{% endif %}
transport_url = {{ keystone_oslomsg_notify_transport }}://{% for host in keystone_oslomsg_notify_servers.split(',') %}{{ keystone_oslomsg_notify_userid }}:{{ keystone_oslomsg_notify_password }}@{{ host }}:{{ keystone_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ keystone_oslomsg_notify_vhost }}{% if keystone_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}
{% endif %}
{% if keystone_cache_servers | length > 0 %}
[cache]