openstack/kolla-ansible
Code Issues Proposed changes

Fix Keystone CADF notifications

Browse Source 
* use template for transport_url that is working for kolla-kubernetes
* use transport_url parameter in DEFAULT section

Co-authored-by: Christian Berendt <berendt@betacloud-solutions.de>

Change-Id: I800b5bc4c178b5df4f208ee50944e2806fd6a7c1
Closes-bug: #1625352
This commit is contained in:
Kevin Fox 2016-09-19 12:59:36 -07:00 committed by Christian Berendt
parent 1863399686
commit ea0e8546ae
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 }}
{% if enable_cadf_notifications %}
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 %}
# 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 %}
[oslo_messaging_notifications]
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 %}