summaryrefslogtreecommitdiff
path: root/openstackclient/api/auth.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-23 13:18:49 +0000
committerGerrit Code Review <review@openstack.org>2016-06-23 13:18:49 +0000
commit45f355b66c822fd608b4085c3c536c7f52e0b219 (patch)
tree95778101384b085c665c31191ccd9975118986f8 /openstackclient/api/auth.py
parent51fcd7c30c466b1241b6f148390c83caca578c49 (diff)
parentccbb2dd1e8aaa5d2f34a30763f71125688c8dfac (diff)
downloadpython-openstackclient-45f355b66c822fd608b4085c3c536c7f52e0b219.tar.gz
Merge "Remove OSCGenericPassword plugin"
Diffstat (limited to 'openstackclient/api/auth.py')
-rw-r--r--openstackclient/api/auth.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstackclient/api/auth.py b/openstackclient/api/auth.py
index d5412594..0c82fe9b 100644
--- a/openstackclient/api/auth.py
+++ b/openstackclient/api/auth.py
@@ -86,7 +86,7 @@ def select_auth_plugin(options):
auth_plugin_name = 'v2password'
else:
# let keystoneclient figure it out itself
- auth_plugin_name = 'osc_password'
+ auth_plugin_name = 'password'
elif options.auth.get('token'):
if options.identity_api_version == '3':
auth_plugin_name = 'v3token'
@@ -98,7 +98,7 @@ def select_auth_plugin(options):
else:
# The ultimate default is similar to the original behaviour,
# but this time with version discovery
- auth_plugin_name = 'osc_password'
+ auth_plugin_name = 'password'
LOG.debug("Auth plugin %s selected", auth_plugin_name)
return auth_plugin_name