openstack
/
keystone
Code Issues Proposed changes

Merge "Enable application_credential auth by default"

This commit is contained in:
Zuul 2018-01-31 21:24:36 +00:00 committed by Gerrit Code Review
parent c8826eb075 5e97f2d052
commit 00e4d0b5cf
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keystone/conf/auth.py
View File

@ -76,6 +76,16 @@ namespace. You do not need to set this unless you are overriding keystone's own
`mapped` authentication plugin.
"""))
application_credential = cfg.StrOpt(
'application_credential',
help=utils.fmt("""
Entry point for the application_credential auth plugin module in the
`keystone.auth.application_credential` namespace. You do not need to set this
unless you are overriding keystone's own `application_credential`
authentication plugin.
"""))
GROUP_NAME = __name__.split('.')[-1]
ALL_OPTS = [
methods,
@ -84,6 +94,7 @@ ALL_OPTS = [
external,
oauth1,
mapped,
application_credential,
]

3
keystone/conf/constants.py
View File

@ -17,7 +17,8 @@ package.
"""
_DEFAULT_AUTH_METHODS = ['external', 'password', 'token', 'oauth1', 'mapped']
_DEFAULT_AUTH_METHODS = ['external', 'password', 'token', 'oauth1', 'mapped',
'application_credential']
_CERTFILE = '/etc/keystone/ssl/certs/signing_cert.pem'
_KEYFILE = '/etc/keystone/ssl/private/signing_key.pem'