diff options
| author | Narasimha SV <narasimha18sv@gmail.com> | 2016-09-30 16:21:26 -0400 |
|---|---|---|
| committer | narasimha18sv <narasimha18sv@gmail.com> | 2016-10-01 16:33:23 +0000 |
| commit | bfd032add4a406c393aafb812b588a973db1f67a (patch) | |
| tree | 2a619f55bfcda7d7cd6fac384fc7baddf23d1f50 | |
| parent | 789f50b2f3bc733015d11287054b63db7c01c03a (diff) | |
| download | kolla-bfd032add4a406c393aafb812b588a973db1f67a.tar.gz kolla-bfd032add4a406c393aafb812b588a973db1f67a.zip | |
Add CADF event configurations in Keystone when enabled
By default CADF events added even if they are disbaled in all.yml.
Boolean check is missing is added so that CADF configurations will
be added only if it is enabled.
Change-Id: I757ae176228cc4e74d06ce85b27200bdcdd5dd5c
Closes-Bug: #1607904
| -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 %} |