diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-03 10:49:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-03 10:49:32 +0000 |
| commit | 74c508faa5ff3c22abcc69e642874878e0d55957 (patch) | |
| tree | 72a21d7709c7807e9cc44187de1fa0b4e0f8252b | |
| parent | bbf9b90b061d1c53633471d1a332eaad433e9ef7 (diff) | |
| parent | bfd032add4a406c393aafb812b588a973db1f67a (diff) | |
| download | kolla-74c508faa5ff3c22abcc69e642874878e0d55957.tar.gz kolla-74c508faa5ff3c22abcc69e642874878e0d55957.zip | |
Merge "Add CADF event configurations in Keystone when enabled"
| -rw-r--r-- | ansible/roles/keystone/templates/keystone.conf.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ansible/roles/keystone/templates/keystone.conf.j2 b/ansible/roles/keystone/templates/keystone.conf.j2 index c5f2f95a4..6f73e98a0 100644 --- a/ansible/roles/keystone/templates/keystone.conf.j2 +++ b/ansible/roles/keystone/templates/keystone.conf.j2 @@ -1,6 +1,6 @@ [DEFAULT] debug = {{ keystone_logging_debug }} -{% if enable_cadf_notifications %} +{% if enable_cadf_notifications | bool %} 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 %} @@ -44,7 +44,7 @@ memcache_servers = {{ memcached_servers }} memcache_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} {%- endif %} -{% if enable_cadf_notifications %} +{% if enable_cadf_notifications | bool %} [oslo_messaging_notifications] driver = messagingv2 {% endif %} |