openstack/keystone
Code Issues Proposed changes

Merge "Move stray notification options into config module"

Browse Source
This commit is contained in:
Jenkins 2016-06-03 19:43:08 +00:00 committed by Gerrit Code Review
commit 05f7315c3c
4 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/keystone.conf.sample
View File

@ -90,10 +90,6 @@
# but is insecure. (boolean value) # but is insecure. (boolean value)
#insecure_debug = false #insecure_debug = false
#
# From keystone.notifications
#
# Default publisher_id for outgoing notifications (string value) # Default publisher_id for outgoing notifications (string value)
#default_publisher_id = <None> #default_publisher_id = <None>

18
keystone/common/config.py
View File

@ -153,6 +153,24 @@ FILE_OPTIONS = {
'or authenticated user to get more information than ' 'or authenticated user to get more information than '
'normal, such as why authentication failed. This may ' 'normal, such as why authentication failed. This may '
'be useful for debugging but is insecure.'), 'be useful for debugging but is insecure.'),
cfg.StrOpt('default_publisher_id',
help='Default publisher_id for outgoing notifications'),
cfg.StrOpt('notification_format', default='basic',
choices=['basic', 'cadf'],
help='Define the notification format for Identity Service '
'events. A "basic" notification has information about '
'the resource being operated on. A "cadf" '
'notification has the same information, as well as '
'information about the initiator of the event.'),
cfg.MultiStrOpt('notification_opt_out', default=[],
help='Define the notification options to opt-out '
'from. The value expected is: '
'identity.<resource_type>.<operation>. This '
'field can be set multiple times in order to add '
'more notifications to opt-out from. For example:'
'\n notification_opt_out=identity.user.created'
'\n notification_opt_out=identity.authenticate.'
'success'),
], ],
'identity': [ 'identity': [
cfg.StrOpt('default_domain_id', default='default', cfg.StrOpt('default_domain_id', default='default',

24
keystone/notifications.py
View File

@ -36,29 +36,6 @@ from keystone.common import utils
_CATALOG_HELPER_OBJ = None _CATALOG_HELPER_OBJ = None
notifier_opts = [
cfg.StrOpt('default_publisher_id',
help='Default publisher_id for outgoing notifications'),
cfg.StrOpt('notification_format', default='basic',
choices=['basic', 'cadf'],
help='Define the notification format for Identity Service '
'events. A "basic" notification has information about '
'the resource being operated on. A "cadf" notification '
'has the same information, as well as information about '
'the initiator of the event.'),
cfg.MultiStrOpt('notification_opt_out', default=[],
help='Define the notification options to opt-out from. '
'The value expected is: '
'identity.<resource_type>.<operation>. This field '
'can be set multiple times in order to add more '
'notifications to opt-out from. For example:\n '
'notification_opt_out=identity.user.created\n '
'notification_opt_out=identity.authenticate.success'),
]
config_section = None
list_opts = lambda: [(config_section, notifier_opts), ]
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
# NOTE(gyee): actions that can be notified. One must update this list whenever # NOTE(gyee): actions that can be notified. One must update this list whenever
# a new action is supported. # a new action is supported.
@ -93,7 +70,6 @@ SERVICE = 'identity'
CONF = cfg.CONF CONF = cfg.CONF
CONF.register_opts(notifier_opts)
# NOTE(morganfainberg): Special case notifications that are only used # NOTE(morganfainberg): Special case notifications that are only used
# internally for handling token persistence token deletions # internally for handling token persistence token deletions

1
setup.cfg
View File

@ -182,7 +182,6 @@ keystone.revoke =
oslo.config.opts = oslo.config.opts =
keystone = keystone.common.config:list_opts keystone = keystone.common.config:list_opts
keystone.notifications = keystone.notifications:list_opts
oslo.config.opts.defaults = oslo.config.opts.defaults =
keystone = keystone.common.config:set_external_opts_defaults keystone = keystone.common.config:set_external_opts_defaults