Remove [magnum] csr_location

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

[1] 54fc369b8a

Change-Id: I99dc25246f0a5196247805d66caf19c728a0c378
This commit is contained in:
Takashi Kajinami 2024-12-10 12:07:42 +09:00 committed by Michal Nasiadka
parent 450943795b
commit ab39098b16
3 changed files with 4 additions and 12 deletions

View File

@ -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)

View File

@ -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."),

View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The ``[magnum] csr_location`` option has been removed.