diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-19 14:23:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-19 14:23:14 +0000 |
| commit | 33bdf93453e0b625398507419008df274b65e3d3 (patch) | |
| tree | 8f78d7a21da18e21d5992a2fb8e803ce9a7bca84 | |
| parent | ebcd7b2979800fb9aed6c6b4d10007705c4d1918 (diff) | |
| parent | 8f6bd4e73539e89ef556a1a8f1f33936ec24f3a4 (diff) | |
| download | kolla-33bdf93453e0b625398507419008df274b65e3d3.tar.gz kolla-33bdf93453e0b625398507419008df274b65e3d3.zip | |
Merge "Enable CADF events in Keystone and introduce enable_cadf_notifications"
| -rw-r--r-- | ansible/group_vars/all.yml | 3 | ||||
| -rw-r--r-- | ansible/roles/keystone/templates/keystone.conf.j2 | 9 | ||||
| -rw-r--r-- | releasenotes/notes/cadf-notifications-6c102c16090688d5.yaml | 6 |
3 files changed, 17 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 %} diff --git a/releasenotes/notes/cadf-notifications-6c102c16090688d5.yaml b/releasenotes/notes/cadf-notifications-6c102c16090688d5.yaml new file mode 100644 index 000000000..cf807edd7 --- /dev/null +++ b/releasenotes/notes/cadf-notifications-6c102c16090688d5.yaml @@ -0,0 +1,6 @@ +--- +features: + - Add support for CADF event notifications. This standard provides + auditing capabilities for compliance with security, operational, + and business processes and supports normalized and categorized + event data for federation and aggregation. |