diff options
| author | Christian Berendt <berendt@betacloud-solutions.de> | 2016-07-29 20:23:13 +0200 |
|---|---|---|
| committer | Christian Berendt <berendt@betacloud-solutions.de> | 2016-09-16 12:19:53 +0000 |
| commit | 8f6bd4e73539e89ef556a1a8f1f33936ec24f3a4 (patch) | |
| tree | 8eefcf74f90da08f59d8d8c417162ac5b4209ae9 /ansible | |
| parent | 112974b0527aff215d95813f777b554bd95807c7 (diff) | |
| download | kolla-8f6bd4e73539e89ef556a1a8f1f33936ec24f3a4.tar.gz kolla-8f6bd4e73539e89ef556a1a8f1f33936ec24f3a4.zip | |
Enable CADF events in Keystone and introduce enable_cadf_notifications
Change-Id: I0a40867ae65011fbfd53308b9d7f42d10435f5fa
Closes-bug: #1607905
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/group_vars/all.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/keystone/templates/keystone.conf.j2 | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 5a28a8962..b7b461d2e 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -239,9 +239,10 @@ enable_neutron: "yes" enable_nova: "yes" enable_rabbitmq: "yes" -# Additional optional OpenStack services are specified here +# Additional optional OpenStack features and services are specified here enable_aodh: "no" enable_barbican: "no" +enable_cadf_notifications: "no" enable_ceilometer: "no" enable_central_logging: "no" enable_ceph: "no" diff --git a/ansible/roles/keystone/templates/keystone.conf.j2 b/ansible/roles/keystone/templates/keystone.conf.j2 index fa1013369..a9bba9a2a 100644 --- a/ansible/roles/keystone/templates/keystone.conf.j2 +++ b/ansible/roles/keystone/templates/keystone.conf.j2 @@ -1,5 +1,8 @@ [DEFAULT] debug = {{ keystone_logging_debug }} +{% if enable_cadf_notifications %} +notification_format = cadf +{% endif %} # NOTE(elemoine) log_dir alone does not work for Keystone log_file = /var/log/kolla/keystone/keystone.log @@ -39,3 +42,9 @@ memcache_servers = {{ memcached_servers }} {% else %} 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 %} +[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 %} |