openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Deprecate admin_token option in auth_token"

Browse Source
This commit is contained in:
Jenkins
2014-04-26 20:37:15 +00:00
committed by Gerrit Code Review
parent 5dd9017616 d6f9f2a860
commit 6be38bb8f5
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
keystoneclient/middleware/auth_token.py
View File

@@ -240,9 +240,12 @@ opts = [
' communicating with Identity API Server.'), ' communicating with Identity API Server.'),
cfg.StrOpt('admin_token', cfg.StrOpt('admin_token',
secret=True, secret=True,
help='Single shared secret with the Keystone configuration' help='This option is deprecated and may be removed in a future'
' release. Single shared secret with the Keystone configuration'
' used for bootstrapping a Keystone installation, or otherwise' ' used for bootstrapping a Keystone installation, or otherwise'
' bypassing the normal authentication process.'), ' bypassing the normal authentication process. This option'
' should not be used, use `admin_user` and `admin_password`'
' instead.'),
cfg.StrOpt('admin_user', cfg.StrOpt('admin_user',
help='Keystone account username'), help='Keystone account username'),
cfg.StrOpt('admin_password', cfg.StrOpt('admin_password',
@@ -480,6 +483,12 @@ class AuthProtocol(object):
# Credentials used to verify this component with the Auth service since # Credentials used to verify this component with the Auth service since
# validating tokens is a privileged call # validating tokens is a privileged call
self.admin_token = self._conf_get('admin_token') self.admin_token = self._conf_get('admin_token')
if self.admin_token:
self.LOG.warning(
"The admin_token option in the auth_token middleware is "
"deprecated and should not be used. The admin_user and "
"admin_password options should be used instead. The "
"admin_token option may be removed in a future release.")
self.admin_token_expiry = None self.admin_token_expiry = None
self.admin_user = self._conf_get('admin_user') self.admin_user = self._conf_get('admin_user')
self.admin_password = self._conf_get('admin_password') self.admin_password = self._conf_get('admin_password')