From 182241a184e222813d15315185ab845c0c5bfba4 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 22 Aug 2024 13:14:35 +0900
Subject: [PATCH] Remove deprecated and ineffective neutron options

These were deprecated during 2023.2 cycle[1], and have been unused
since the fallback to admin user credential has been removed.

[1] fd09a0cfc392349ec3e7437c86aabef40c574cd4

Change-Id: Ie8c9d099a45ebd684248662dfb9e17f51a3136d4
---
 designate/conf/network_api.py                 | 29 -------------------
 doc/source/contributor/gmr.rst                |  5 ----
 doc/source/contributor/integrations.rst       |  7 -----
 ...lean-up-neutron-opts-1ff35105972d3acb.yaml | 11 +++++++
 4 files changed, 11 insertions(+), 41 deletions(-)
 create mode 100644 releasenotes/notes/clean-up-neutron-opts-1ff35105972d3acb.yaml

diff --git a/designate/conf/network_api.py b/designate/conf/network_api.py
index 202e2255e..5a559de37 100644
--- a/designate/conf/network_api.py
+++ b/designate/conf/network_api.py
@@ -33,35 +33,6 @@ NETWORK_API_NEUTRON_OPTS = [
     cfg.StrOpt('client_certificate_file',
                help='Location of client certificate file to use for '
                     'neutron client requests.'),
-
-
-    cfg.StrOpt('admin_username',
-               help='username for connecting to neutron in admin context',
-               deprecated_for_removal=True,
-               deprecated_reason='This parameter is no longer used.',
-               deprecated_since='2023.2'),
-    cfg.StrOpt('admin_password',
-               help='password for connecting to neutron in admin context',
-               secret=True, deprecated_for_removal=True,
-               deprecated_reason='This parameter is no longer used.',
-               deprecated_since='2023.2'),
-    cfg.StrOpt('admin_tenant_name',
-               help='tenant name for connecting to neutron in admin context',
-               deprecated_for_removal=True,
-               deprecated_reason='This parameter is no longer used.',
-               deprecated_since='2023.2'),
-    cfg.StrOpt('auth_url',
-               help='auth url for connecting to neutron in admin context',
-               deprecated_for_removal=True,
-               deprecated_reason='This parameter is no longer used.',
-               deprecated_since='2023.2'),
-    cfg.StrOpt('auth_strategy',
-               default='keystone',
-               help='auth strategy for connecting to '
-                    'neutron in admin context',
-               deprecated_for_removal=True,
-               deprecated_reason='This parameter is no longer used.',
-               deprecated_since='2023.2'),
 ]
 
 
diff --git a/doc/source/contributor/gmr.rst b/doc/source/contributor/gmr.rst
index 471db29eb..b36b8bf66 100644
--- a/doc/source/contributor/gmr.rst
+++ b/doc/source/contributor/gmr.rst
@@ -359,11 +359,6 @@ GMR Example
       verbose = True
 
     network_api:neutron:
-      admin_password = ***
-      admin_tenant_name = None
-      admin_username = None
-      auth_strategy = keystone
-      auth_url = None
       ca_certificates_file = None
       endpoint_type = publicURL
       endpoints = None
diff --git a/doc/source/contributor/integrations.rst b/doc/source/contributor/integrations.rst
index 18d368a59..6bb5f5283 100644
--- a/doc/source/contributor/integrations.rst
+++ b/doc/source/contributor/integrations.rst
@@ -55,14 +55,7 @@ Configuring the FloatingIP feature is really simple:
     endpoints = RegionOne|http://localhost:9696
     endpoint_type = publicURL
     timeout = 30
-    # This is optional - if these credentials are not provided designate will
-    # use the users context and auth token to query neutron
-    #admin_username = designate
-    #admin_password = designate
-    #admin_tenant_name = designate
-    auth_url = http://localhost:35357/v2.0
     insecure = False
-    auth_strategy = keystone
     ca_certificates_file = /etc/path/to/ca.pem
 
 Note that using admin_user, admin_password and admin_tenant_name is optional,
diff --git a/releasenotes/notes/clean-up-neutron-opts-1ff35105972d3acb.yaml b/releasenotes/notes/clean-up-neutron-opts-1ff35105972d3acb.yaml
new file mode 100644
index 000000000..60d1d9651
--- /dev/null
+++ b/releasenotes/notes/clean-up-neutron-opts-1ff35105972d3acb.yaml
@@ -0,0 +1,11 @@
+---
+upgrade:
+  - |
+    The following deprecated options in the ``network_api:neutron`` section
+    have been removed.
+
+    - ``admin_username``
+    - ``admin_password``
+    - ``admin_tenant_name``
+    - ``auth_url``
+    - ``auth_strategy``