From ea0e8546ae9fa1455a43a2e731e1333cd6a56e92 Mon Sep 17 00:00:00 2001
From: Kevin Fox <kevin@efox.cc>
Date: Mon, 19 Sep 2016 12:59:36 -0700
Subject: [PATCH] Fix Keystone CADF notifications
* 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
---
ansible/roles/keystone/templates/keystone.conf.j2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ansible/roles/keystone/templates/keystone.conf.j2 b/ansible/roles/keystone/templates/keystone.conf.j2
index a9bba9a2a4..c5f2f95a44 100644
--- a/ansible/roles/keystone/templates/keystone.conf.j2
+++ b/ansible/roles/keystone/templates/keystone.conf.j2
@@ -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 %}