diff options
| author | Zuul <zuul@review.openstack.org> | 2018-07-24 05:10:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-07-24 05:10:35 +0000 |
| commit | 0f56085c0286a022c31258689d9a416f77979d90 (patch) | |
| tree | 02a3a9e19d8b6c265eeb06eb2772498caba4482a | |
| parent | 93dae2a82226d572e79c8cc87ab976c1eb03757b (diff) | |
| parent | a331f06df0158fff28162eabc765f164855afcee (diff) | |
| download | python-cinderclient-0f56085c0286a022c31258689d9a416f77979d90.tar.gz | |
Merge "Remove deprecated CLI options"
| -rw-r--r-- | cinderclient/shell.py | 28 | ||||
| -rw-r--r-- | releasenotes/notes/remove-deprecations-621919062f867015.yaml | 15 |
2 files changed, 15 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', diff --git a/releasenotes/notes/remove-deprecations-621919062f867015.yaml b/releasenotes/notes/remove-deprecations-621919062f867015.yaml new file mode 100644 index 0000000..38603de --- /dev/null +++ b/releasenotes/notes/remove-deprecations-621919062f867015.yaml @@ -0,0 +1,15 @@ +--- +upgrade: + - | + The following CLI options were deprecated for one or more releases and have + now been removed: + + ``--endpoint-type`` + This option has been replaced by ``--os-endpoint-type``. + + ``--bypass-url`` + This option has been replaced by ``--os-endpoint``. + + ``--os-auth-system`` + This option has been replaced by ``--os-auth-type``. + |