From 493c8289005ccdb62461746b5fb00edab19b38cd Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 28 Nov 2022 18:30:26 +0900
Subject: [PATCH] Remove parameters for native ssl support

These parameters were deprecated during the previous cycle by [1] and
have had no effect. These parameters are not really used by recent
glance.

[1] 2a2f349d8a1f0426f77bdbea6c70a316b4c3daa0

Depends-on: https://review.opendev.org/865924
Related-Bug: #1965776
Change-Id: Ia24b57966f6d8aee5cfa56cfe3496f1d81924ea1
---
 manifests/api.pp                              | 21 -------------------
 .../remove-native-ssl-e88e094e772612dd.yaml   |  8 +++++++
 2 files changed, 8 insertions(+), 21 deletions(-)
 create mode 100644 releasenotes/notes/remove-native-ssl-e88e094e772612dd.yaml

diff --git a/manifests/api.pp b/manifests/api.pp
index eb0c1971..a1b88525 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -268,18 +268,6 @@
 #   (optional) The amount of time in seconds to delay before performing a delete.
 #   Defaults to undef
 #
-# [*cert_file*]
-#   (optional) Certificate file to use when starting API server securely
-#   Defaults to undef
-#
-# [*key_file*]
-#   (optional) Private key file to use when starting API server securely
-#   Defaults to undef
-#
-# [*ca_file*]
-#   (optional) CA certificate file to use to verify connecting clients
-#   Defaults to undef
-#
 # [*filesystem_store_metadata_file*]
 #   (optional) The path to a file which contains the metadata to be returned
 #    with any location associated with the filesystem store
@@ -358,9 +346,6 @@ class glance::api(
   $validate                             = undef,
   $validation_options                   = undef,
   $scrub_time                           = undef,
-  $cert_file                            = undef,
-  $key_file                             = undef,
-  $ca_file                              = undef,
   $filesystem_store_metadata_file       = undef,
   $filesystem_store_file_perm           = undef,
   $pipeline                             = undef,
@@ -386,12 +371,6 @@ class glance::api(
     'DEFAULT/scrub_time': ensure => absent;
   }
 
-  ['cert_file', 'key_file', 'ca_file'].each |String $ssl_opt| {
-    if getvar($ssl_opt) != undef {
-      warning("The ${ssl_opt} parameter has been deprecated and has no effect.")
-    }
-  }
-
   ['filesystem_store_metadata_file', 'filesystem_store_file_perm'].each |String $fs_opt| {
     if getvar($fs_opt) != undef {
       warning("The ${fs_opt} parameter has been deprecated and will be removed.")
diff --git a/releasenotes/notes/remove-native-ssl-e88e094e772612dd.yaml b/releasenotes/notes/remove-native-ssl-e88e094e772612dd.yaml
new file mode 100644
index 00000000..3c83c402
--- /dev/null
+++ b/releasenotes/notes/remove-native-ssl-e88e094e772612dd.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The following parameters of the ``glance::api`` class have been removed.
+
+    - ``cert_file``
+    - ``key_file``
+    - ``ca_file``