Remove deprecated CLI options

stmcginnis · stmcginnis · commit a331f06df015 · 2018-07-23T11:50:35.000-05:00
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 &lt;sean.mcginnis@gmail.com&gt;
diff --git a/cinderclient/shell.py b/cinderclient/shell.py
@@ -173,13 +173,6 @@ def get_base_parser(self):
                             % 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 @@ def get_base_parser(self):
         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 @@ def _append_global_identity_args(self, parser):
         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
@@ -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``.
+
