Remove deprecated options

Remove the following deprecated options.

* --endpoint-override
* --instance-name ('nova list' command)

Change-Id: Ic6a78f04a98c1616750e6ecd6225f2750c214dd7

4 files changed, 11 insertions, 37 deletions

diff --git a/doc/source/cli/nova.rst b/doc/source/cli/nova.rst
index 21f760d7..75f6ee90 100644
--- a/doc/source/cli/nova.rst
+++ b/doc/source/cli/nova.rst
@@ -2187,10 +2187,10 @@ nova list
 
    usage: nova list [--reservation-id <reservation-id>] [--ip <ip-regexp>]
                     [--ip6 <ip6-regexp>] [--name <name-regexp>]
-                    [--instance-name <name-regexp>] [--status <status>]
-                    [--flavor <flavor>] [--image <image>] [--host <hostname>]
-                    [--all-tenants [<0|1>]] [--tenant [<tenant>]]
-                    [--user [<user>]] [--deleted] [--fields <fields>] [--minimal]
+                    [--status <status>] [--flavor <flavor>] [--image <image>]
+                    [--host <hostname>] [--all-tenants [<0|1>]]
+                    [--tenant [<tenant>]] [--user [<user>]] [--deleted]
+                    [--fields <fields>] [--minimal]
                     [--sort <key>[:<direction>]] [--marker <marker>]
                     [--limit <limit>] [--changes-since <changes_since>]
                     [--changes-before <changes_before>]
@@ -2219,10 +2219,6 @@ present in the failure domain.
 ``--name <name-regexp>``
   Search with regular expression match by name.
 
-``--instance-name <name-regexp>``
-  Search with regular expression match by server
-  name.
-
 ``--status <status>``
   Search by server status.
 
diff --git a/novaclient/shell.py b/novaclient/shell.py
index 2f6a33e8..c82cd506 100644
--- a/novaclient/shell.py
+++ b/novaclient/shell.py
@@ -367,26 +367,6 @@ class OpenStackComputeShell(object):
             help=_("Use this API endpoint instead of the Service Catalog. "
                    "Defaults to env[OS_ENDPOINT_OVERRIDE]."))
 
-        # NOTE(takashin): This dummy '--end' argument was added
-        # to avoid misinterpreting command line arguments.
-        # If there is not this dummy argument, the '--end' is interpreted to
-        # the '--endpoint-override'.
-        # TODO(takashin): Remove this dummy '--end' argument
-        # when the deprecated '--endpoint-override' argument is removed.
-        parser.add_argument(
-            '--end',
-            metavar='<end>',
-            nargs='?',
-            help=argparse.SUPPRESS)
-
-        parser.add_argument(
-            '--endpoint-override',
-            action=DeprecatedAction,
-            use=_('use "%s"; this option will be removed after Rocky '
-                  'OpenStack release.') % '--os-endpoint-override',
-            dest='endpoint_override',
-            help=argparse.SUPPRESS)
-
         if osprofiler_profiler:
             parser.add_argument('--profile',
                                 metavar='HMAC_KEY',
diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py
index c848521a..a5a5ead2 100644
--- a/novaclient/v2/shell.py
+++ b/novaclient/v2/shell.py
@@ -1419,14 +1419,6 @@ def _print_flavor(flavor):
     default=None,
     help=_('Search with regular expression match by name.'))
 @utils.arg(
-    '--instance-name',
-    dest='instance_name',
-    metavar='<name-regexp>',
-    default=None,
-    action=shell.DeprecatedAction,
-    help=_('Search with regular expression match by server name. The option '
-           'is not used and will be removed in T release.'))
-@utils.arg(
     '--status',
     dest='status',
     metavar='<status>',
@@ -1596,7 +1588,6 @@ def do_list(cs, args):
         'user_id': args.user,
         'host': args.host,
         'deleted': args.deleted,
-        'instance_name': args.instance_name,
         'changes-since': args.changes_since}
 
     for arg in ('tags', "tags-any", 'not-tags', 'not-tags-any'):
diff --git a/releasenotes/notes/remove-deprecated-option-14.0.0-c6d7189938f5f063.yaml b/releasenotes/notes/remove-deprecated-option-14.0.0-c6d7189938f5f063.yaml
new file mode 100644
index 00000000..b91ff58f
--- /dev/null
+++ b/releasenotes/notes/remove-deprecated-option-14.0.0-c6d7189938f5f063.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The following deprecated options have been removed.
+
+    * ``--endpoint-override`` (Authentication option)
+    * ``--instance-name`` (``nova list`` command)