Merge "enable cadf auditing support"

keystone/files/kilo/keystone.conf.Debian

@@ -97,6 +97,7 @@ secure_proxy_ssl_header = "HTTP_X_FORWARDED_PROTO"
 # notification has the same information, as well as information about the
 # initiator of the event. Valid options are: basic and cadf (string value)
 #notification_format = basic
+notification_format = {{ server.get("notification_format", "basic") }}
 
 #
 # From keystone.openstack.common.eventlet_backdoor

keystone/files/liberty/keystone.conf.Debian

@@ -93,6 +93,7 @@ secure_proxy_ssl_header = "HTTP_X_FORWARDED_PROTO"
 # initiator of the event. (string value)
 # Allowed values: basic, cadf
 #notification_format = basic
+notification_format = {{ server.get("notification_format", "basic") }}
 
 #
 # From oslo.log

keystone/files/mitaka/keystone.conf.Debian

@@ -104,6 +104,7 @@ secure_proxy_ssl_header = "HTTP_X_FORWARDED_PROTO"
 # initiator of the event. (string value)
 # Allowed values: basic, cadf
 #notification_format = basic
+notification_format = {{ server.get("notification_format", "basic") }}
 
 # Define the notification options to opt-out from. The value expected is:
 # identity.<resource_type>.<operation>. This field can be set multiple times in
@@ -2169,4 +2170,4 @@ driver = memcache_pool
 #driver = sql
 
 [extra_headers]
-Distribution = Ubuntu
+Distribution = Ubuntu

keystone/map.jinja

@@ -1,7 +1,7 @@
 
 {% set server = salt['grains.filter_by']({
     'Debian': {
-        'pkgs': ['keystone', 'python-keystone', 'python-keystoneclient', 'python-psycopg2', 'python-mysqldb', 'mysql-client', 'python-six', 'python-memcache', 'python-openstackclient', 'gettext-base'],
+        'pkgs': ['keystone', 'python-keystone', 'python-keystoneclient', 'python-psycopg2', 'python-mysqldb', 'mysql-client', 'python-six', 'python-memcache', 'python-openstackclient', 'gettext-base', 'python-pycadf'],
         'service_name': 'keystone',
         'version': 'icehouse',
         'api_version': '2',
@@ -13,7 +13,7 @@
         'roles': ['admin', 'Member']
     },
     'RedHat': {
-        'pkgs': ['openstack-keystone', 'openstack-utils', 'python-keystone', 'python-keystoneclient'],
+        'pkgs': ['openstack-keystone', 'openstack-utils', 'python-keystone', 'python-keystoneclient', 'python-pycadf'],
         'service_name': 'openstack-keystone',
         'api_version': '2',
         'version': 'icehouse',

tests/pillar/cluster.sls

@@ -26,6 +26,7 @@ keystone:
       expiration: 86400
       location: /etc/keystone/fernet-keys/
     notification: true
+    notification_format: cadf
     message_queue:
       engine: rabbitmq
       host: 127.0.0.1
@@ -42,4 +43,4 @@ keystone:
       - host: 127.0.0.1
         port: 11211
       - host: 127.0.0.1
-        port: 11211
+        port: 11211