openstack
/
keystone
Code Issues Proposed changes

Merge "add oauth authentication to config file"

This commit is contained in:
Jenkins 2015-03-11 12:26:42 +00:00 committed by Gerrit Code Review
parent 71d6a693a8 1d6525e6cc
commit fffece126a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keystone/common/config.py
View File

@ -16,7 +16,7 @@ from oslo_config import cfg
import oslo_messaging
_DEFAULT_AUTH_METHODS = ['external', 'password', 'token']
_DEFAULT_AUTH_METHODS = ['external', 'password', 'token', 'oauth1']
_CERTFILE = '/etc/keystone/ssl/certs/signing_cert.pem'
_KEYFILE = '/etc/keystone/ssl/private/signing_key.pem'
_SSO_CALLBACK = '/etc/keystone/sso_callback_template.html'
@ -831,6 +831,9 @@ FILE_OPTIONS = {
cfg.StrOpt('external',
default='keystone.auth.plugins.external.DefaultDomain',
help='The external (REMOTE_USER) auth plugin module.'),
cfg.StrOpt('oauth1',
default='keystone.auth.plugins.oauth1.OAuth',
help='The oAuth1.0 auth plugin module.'),
],
'paste_deploy': [
cfg.StrOpt('config_file', default='keystone-paste.ini',