summaryrefslogtreecommitdiff
path: root/cinderclient
diff options
context:
space:
mode:
authorSean McGinnis <sean.mcginnis@gmail.com>2018-07-23 11:50:35 -0500
committerSean McGinnis <sean.mcginnis@gmail.com>2018-07-23 11:50:35 -0500
commita331f06df0158fff28162eabc765f164855afcee (patch)
treefb5ace2b6d90569430e25be95d3bd607d33e23aa /cinderclient
parent4536b2fb9f8d896fc5b46bd5cfe7ca19167ce5bc (diff)
downloadpython-cinderclient-a331f06df0158fff28162eabc765f164855afcee.tar.gz
Remove deprecated CLI options
The following options were deprecated in Queens or Pike and are now being removed: --endpoint-type --bypass-url --os-auth-system Change-Id: I3b951cc4eb3adff23f3d2cbe674971816261ef56 Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
Diffstat (limited to 'cinderclient')
-rw-r--r--cinderclient/shell.py28
1 files changed, 0 insertions, 28 deletions
diff --git a/cinderclient/shell.py b/cinderclient/shell.py
index 7e0a688..8807b70 100644
--- a/cinderclient/shell.py
+++ b/cinderclient/shell.py
@@ -173,13 +173,6 @@ class OpenStackCinderShell(object):
% DEFAULT_CINDER_ENDPOINT_TYPE)
parser.add_argument('--os_endpoint_type',
help=argparse.SUPPRESS)
- parser.add_argument('--endpoint-type',
- metavar='<endpoint-type>',
- dest='os_endpoint_type',
- help=_('DEPRECATED! Use --os-endpoint-type.'))
- parser.add_argument('--endpoint_type',
- dest='os_endpoint_type',
- help=argparse.SUPPRESS)
parser.add_argument('--os-volume-api-version',
metavar='<volume-api-ver>',
@@ -192,18 +185,6 @@ class OpenStackCinderShell(object):
parser.add_argument('--os_volume_api_version',
help=argparse.SUPPRESS)
- parser.add_argument('--bypass-url',
- metavar='<bypass-url>',
- dest='os_endpoint',
- default=utils.env('CINDERCLIENT_BYPASS_URL',
- default=utils.env('CINDER_ENDPOINT')),
- help=_("DEPRECATED! Use os_endpoint. "
- "Use this API endpoint instead of the "
- "Service Catalog. Defaults to "
- "env[CINDERCLIENT_BYPASS_URL]."))
- parser.add_argument('--bypass_url',
- help=argparse.SUPPRESS)
-
parser.add_argument('--os-endpoint',
metavar='<os-endpoint>',
dest='os_endpoint',
@@ -269,15 +250,6 @@ class OpenStackCinderShell(object):
parser.add_argument('--os_auth_type',
help=argparse.SUPPRESS)
- parser.add_argument('--os-auth-system',
- metavar='<os-auth-system>',
- dest='os_auth_type',
- default=env_plugin,
- help=_('DEPRECATED! Use --os-auth-type. '
- 'Defaults to env[OS_AUTH_SYSTEM].'))
- parser.add_argument('--os_auth_system',
- help=argparse.SUPPRESS)
-
parser.set_defaults(os_username=utils.env('OS_USERNAME',
'CINDER_USERNAME'))
parser.add_argument('--os_username',