diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-20 12:26:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-20 12:26:26 +0000 |
| commit | a5527505c8b277f387536d868e1dbddef4623df7 (patch) | |
| tree | de2ef5ec65e8ca6040fb4bb403c261118e982cbc | |
| parent | b7ea5ed91eb98ea9fc18d91b3d5da1aae7603436 (diff) | |
| parent | ea0e8546ae9fa1455a43a2e731e1333cd6a56e92 (diff) | |
| download | kolla-a5527505c8b277f387536d868e1dbddef4623df7.tar.gz kolla-a5527505c8b277f387536d868e1dbddef4623df7.zip | |
Merge "Fix Keystone CADF notifications"
| -rw-r--r-- | ansible/roles/keystone/templates/keystone.conf.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ansible/roles/keystone/templates/keystone.conf.j2 b/ansible/roles/keystone/templates/keystone.conf.j2 index a9bba9a2a..c5f2f95a4 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 %} |