summaryrefslogtreecommitdiff
path: root/keystoneclient/contrib
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2015-11-19 10:22:31 -0500
committerSteve Martinelli <stevemar@ca.ibm.com>2015-11-19 15:48:28 +0000
commit13bb2f74b0d65c1fef30f77d710d56e51e5f7841 (patch)
tree63fd195310fc49fab213421beac45b5d8c8df1df /keystoneclient/contrib
parent4a070903d29aca07a8d19b59bb20818d1c759c44 (diff)
downloadpython-keystoneclient-13bb2f74b0d65c1fef30f77d710d56e51e5f7841.tar.gz
Swap the order of username deprecation
The attempt at a move to user-name is an exercise in churn, and is filling everyone's logs with admonitions to change the name of their variables - which does not work if they do. Swap this, effectively reverting the attempt at a move. user-name will continue to work on the off chance anyone started consuming that path, which is unlikely because none of the consuming programs expose that as an actual option. Closes-Bug: 1498247 Change-Id: I62d991fda1df63c9cbabfde2f6836bc031f5147c
Diffstat (limited to 'keystoneclient/contrib')
-rw-r--r--keystoneclient/contrib/auth/v3/saml2.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/keystoneclient/contrib/auth/v3/saml2.py b/keystoneclient/contrib/auth/v3/saml2.py
index 3a311d4..2e74996 100644
--- a/keystoneclient/contrib/auth/v3/saml2.py
+++ b/keystoneclient/contrib/auth/v3/saml2.py
@@ -72,8 +72,8 @@ class _BaseSAMLPlugin(v3.AuthConstructor):
cfg.StrOpt('identity-provider', help="Identity Provider's name"),
cfg.StrOpt('identity-provider-url',
help="Identity Provider's URL"),
- cfg.StrOpt('user-name', dest='username', help='Username',
- deprecated_name='username'),
+ cfg.StrOpt('username', dest='username', help='Username',
+ deprecated_name='user-name'),
cfg.StrOpt('password', help='Password')
])
return options