From 00d5d9f9491a37e765252304c6561f755c7be478 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 20 Mar 2024 17:43:56 +0900 Subject: [PATCH] Remove deprecated ssl options These options were deprecated for 8+ years[1]. [1] 2e2940d1e17706b9d6367ff1783bde9d41891bfa Change-Id: If88d7242251b9e25c1d4ee9ec9444f87fe2bcd6a --- oslo_service/_options.py | 12 +++--------- .../remove-deprecated-ssl-opts-46e9d7a53f725340.yaml | 9 +++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 releasenotes/notes/remove-deprecated-ssl-opts-46e9d7a53f725340.yaml diff --git a/oslo_service/_options.py b/oslo_service/_options.py index 72c06f36..27258a1c 100644 --- a/oslo_service/_options.py +++ b/oslo_service/_options.py @@ -98,19 +98,13 @@ wsgi_opts = [ ssl_opts = [ cfg.StrOpt('ca_file', help="CA certificate file to use to verify " - "connecting clients.", - deprecated_group='DEFAULT', - deprecated_name='ssl_ca_file'), + "connecting clients."), cfg.StrOpt('cert_file', help="Certificate file to use when starting " - "the server securely.", - deprecated_group='DEFAULT', - deprecated_name='ssl_cert_file'), + "the server securely."), cfg.StrOpt('key_file', help="Private key file to use when starting " - "the server securely.", - deprecated_group='DEFAULT', - deprecated_name='ssl_key_file'), + "the server securely."), cfg.StrOpt('version', help='SSL version to use (valid only if SSL enabled). ' 'Valid values are TLSv1 and SSLv23. SSLv2, SSLv3, ' diff --git a/releasenotes/notes/remove-deprecated-ssl-opts-46e9d7a53f725340.yaml b/releasenotes/notes/remove-deprecated-ssl-opts-46e9d7a53f725340.yaml new file mode 100644 index 00000000..1ccb884d --- /dev/null +++ b/releasenotes/notes/remove-deprecated-ssl-opts-46e9d7a53f725340.yaml @@ -0,0 +1,9 @@ +--- +upgrade: + - | + The following deprecated options have been removed. Use the ``[ssl]`` + options instead. + + - ``[DEFAULT] ssl_ca_file`` + - ``[DEFAULT] ssl_cert_file`` + - ``[DEFAULT] ssl_key_file``