Merge "Remove the Keystone admin checks"
diff --git a/keystone/files/kilo/keystone.conf.Debian b/keystone/files/kilo/keystone.conf.Debian
index 263c70a..0e59b15 100644
--- a/keystone/files/kilo/keystone.conf.Debian
+++ b/keystone/files/kilo/keystone.conf.Debian
@@ -97,6 +97,7 @@
# 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
diff --git a/keystone/files/liberty/keystone.conf.Debian b/keystone/files/liberty/keystone.conf.Debian
index 159e082..48cb53f 100644
--- a/keystone/files/liberty/keystone.conf.Debian
+++ b/keystone/files/liberty/keystone.conf.Debian
@@ -93,6 +93,7 @@
# initiator of the event. (string value)
# Allowed values: basic, cadf
#notification_format = basic
+notification_format = {{ server.get("notification_format", "basic") }}
#
# From oslo.log
diff --git a/keystone/files/mitaka/keystone.conf.Debian b/keystone/files/mitaka/keystone.conf.Debian
index d21cc89..e07fdc8 100644
--- a/keystone/files/mitaka/keystone.conf.Debian
+++ b/keystone/files/mitaka/keystone.conf.Debian
@@ -104,6 +104,7 @@
# 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 = sql
[extra_headers]
-Distribution = Ubuntu
\ No newline at end of file
+Distribution = Ubuntu
diff --git a/keystone/map.jinja b/keystone/map.jinja
index 91eff9c..284130f 100644
--- a/keystone/map.jinja
+++ b/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',
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index da3d86d..b8b0aa5 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -26,6 +26,7 @@
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 @@
- host: 127.0.0.1
port: 11211
- host: 127.0.0.1
- port: 11211
\ No newline at end of file
+ port: 11211