From ab39098b1670f862daa3e8bca5ca59bbd5bac5cc Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 10 Dec 2024 12:07:42 +0900
Subject: [PATCH] Remove [magnum] csr_location

This option was deprecated 8 years ago by [1] and has had no effect
since then.

[1] 54fc369b8a7a346ea19ed9cf1fd1a4fa53f22063

Change-Id: I99dc25246f0a5196247805d66caf19c728a0c378
---
 magnum_tempest_plugin/common/config.py                     | 7 -------
 magnum_tempest_plugin/config.py                            | 5 -----
 .../notes/remove-csr_location-f2093640dfecaae8.yaml        | 4 ++++
 3 files changed, 4 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/remove-csr_location-f2093640dfecaae8.yaml

diff --git a/magnum_tempest_plugin/common/config.py b/magnum_tempest_plugin/common/config.py
index 5bbb226..981deff 100644
--- a/magnum_tempest_plugin/common/config.py
+++ b/magnum_tempest_plugin/common/config.py
@@ -124,12 +124,6 @@ class Config(object):
             raise Exception('config missing master_flavor_id key')
         cls.master_flavor_id = CONF.magnum.master_flavor_id
 
-    @classmethod
-    def set_csr_location(cls, config):
-        if 'csr_location' not in CONF.magnum:
-            raise Exception('config missing csr_location key')
-        cls.csr_location = CONF.magnum.csr_location
-
     @classmethod
     def set_dns_nameserver(cls, config):
         if 'dns_nameserver' not in CONF.magnum:
@@ -177,7 +171,6 @@ class Config(object):
         cls.set_flavor_id(config)
         cls.set_magnum_url(config)
         cls.set_master_flavor_id(config)
-        cls.set_csr_location(config)
         cls.set_dns_nameserver(config)
         cls.set_copy_logs(config)
         cls.set_coe(config)
diff --git a/magnum_tempest_plugin/config.py b/magnum_tempest_plugin/config.py
index 2588643..45064a5 100644
--- a/magnum_tempest_plugin/config.py
+++ b/magnum_tempest_plugin/config.py
@@ -58,11 +58,6 @@ MagnumGroup = [
     cfg.StrOpt("master_flavor_id",
                default="ds2G",
                help="Master flavor id to use for ClusterTemplate."),
-    cfg.StrOpt("csr_location",
-               default="/opt/stack/new/magnum/default.csr",
-               deprecated_for_removal=True,
-               help="CSR location for certificates. This option is no "
-               "longer used for anything."),
     cfg.StrOpt("dns_nameserver",
                default="8.8.8.8",
                help="DNS nameserver to use for ClusterTemplate."),
diff --git a/releasenotes/notes/remove-csr_location-f2093640dfecaae8.yaml b/releasenotes/notes/remove-csr_location-f2093640dfecaae8.yaml
new file mode 100644
index 0000000..704e002
--- /dev/null
+++ b/releasenotes/notes/remove-csr_location-f2093640dfecaae8.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``[magnum] csr_location`` option has been removed.