summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@gmail.com>2012-03-29 14:56:57 -0700
committerDolph Mathews <dolph.mathews@gmail.com>2012-06-21 11:23:31 -0500
commit44a1ee32e29825257cac5c0a61fc3be51b79eb65 (patch)
tree9a7e65aefebd343015a80290d48ab38840b8f6de
parentf6267d5c0d72da6e1270894172b0497527b280c0 (diff)
downloadpython-keystoneclient-44a1ee32e29825257cac5c0a61fc3be51b79eb65.tar.gz
Drop support for legacy OS args0.1.0
Change-Id: If37778e6bb8c34d88974f2dbf22207110a3dea1a
-rw-r--r--keystoneclient/shell.py30
1 files changed, 0 insertions, 30 deletions
diff --git a/keystoneclient/shell.py b/keystoneclient/shell.py
index 3441d4c..aece369 100644
--- a/keystoneclient/shell.py
+++ b/keystoneclient/shell.py
@@ -113,29 +113,6 @@ class OpenStackIdentityShell(object):
default=env('SERVICE_ENDPOINT'),
help='Defaults to env[SERVICE_ENDPOINT]')
- # FIXME(dtroyer): The args below are here for diablo compatibility,
- # remove them in folsum cycle
-
- parser.add_argument('--username',
- metavar='<auth-user-name>',
- help='Deprecated')
-
- parser.add_argument('--password',
- metavar='<auth-password>',
- help='Deprecated')
-
- parser.add_argument('--tenant_name',
- metavar='<tenant-name>',
- help='Deprecated')
-
- parser.add_argument('--auth_url',
- metavar='<auth-url>',
- help='Deprecated')
-
- parser.add_argument('--region_name',
- metavar='<region-name>',
- help='Deprecated')
-
return parser
def get_subcommand_parser(self, version):
@@ -210,13 +187,6 @@ class OpenStackIdentityShell(object):
#FIXME(usrleon): Here should be restrict for project id same as
# for username or apikey but for compatibility it is not.
- # provide support for legacy args
- args.os_username = args.os_username or args.username
- args.os_password = args.os_password or args.password
- args.os_auth_url = args.os_auth_url or args.auth_url
- args.os_tenant_name = args.os_tenant_name or args.tenant_name
- args.os_region_name = args.os_region_name or args.region_name
-
if not utils.isunauthenticated(args.func):
# if the user hasn't provided any auth data
if not (args.token or args.endpoint or args.os_username or