summaryrefslogtreecommitdiff
path: root/openstackclient/shell.py
diff options
context:
space:
mode:
authorDean Troyer <dtroyer@gmail.com>2015-03-03 20:29:38 -0600
committerSteve Martinelli <stevemar@ca.ibm.com>2015-03-10 03:16:12 +0000
commit749920bc65d4859eeaf44d16ae94f842d88af178 (patch)
tree17fb3120501a7936d5583caaee0c3d3cd52892c1 /openstackclient/shell.py
parentdc00d7c758a431845750974cc10a2734e14f9d03 (diff)
downloadpython-openstackclient-749920bc65d4859eeaf44d16ae94f842d88af178.tar.gz
Move OSC auth plugins so they can be found
The plugin detection at the top of openstackclient.api.auth did not detect the plugins at the bottom of that file because, surprise, they had not been declared yet so the entry points were ignored. Move both plugin subclasses into openstackclient.api.auth_plugin. Fix a problem with the password callback that was otherwise made worse with this change. Closes-Bug: 1428912 Change-Id: Idc3b72534071e0013c8922884a8bc14137509a0f
Diffstat (limited to 'openstackclient/shell.py')
-rw-r--r--openstackclient/shell.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index b61da2b9..3cfd7312 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -188,12 +188,6 @@ class OpenStackShell(app.App):
description,
version)
- # service token auth argument
- parser.add_argument(
- '--os-url',
- metavar='<url>',
- default=utils.env('OS_URL'),
- help='Defaults to env[OS_URL]')
# Global arguments
parser.add_argument(
'--os-region-name',