openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix Keystone CADF notifications"

Browse Source
This commit is contained in:
Jenkins 2016-09-20 12:26:25 +00:00 committed by Gerrit Code Review
commit a5527505c8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/keystone/templates/keystone.conf.j2
View File

@ -2,6 +2,7 @@
debug = {{ keystone_logging_debug }} debug = {{ keystone_logging_debug }}
{% if enable_cadf_notifications %} {% if enable_cadf_notifications %}
notification_format = cadf notification_format = cadf
transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{% if orchestration_engine == 'KUBERNETES' %}rabbitmq{% else %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}{% endif %}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
{% endif %} {% endif %}
# NOTE(elemoine) log_dir alone does not work for Keystone # NOTE(elemoine) log_dir alone does not work for Keystone
@ -46,5 +47,4 @@ memcache_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansib
{% if enable_cadf_notifications %} {% if enable_cadf_notifications %}
[oslo_messaging_notifications] [oslo_messaging_notifications]
driver = messagingv2 driver = messagingv2
transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
{% endif %} {% endif %}