From 9c6f3af402a86040edc4cd9658336bbcc6963ea2 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 6 Jan 2023 13:06:17 +0900
Subject: [PATCH] api: Remove deprecated ssl parameters

These parameters were deprecated during the previous cycle[1] because
these are not actually used by barbican.

[1] 109ea49acbc89d9009a6201be5feb08e36d31678

Change-Id: I6471ed0fe696f2c6455150adc63c9c896037e404
---
 manifests/api.pp                              | 35 -------------------
 .../remove-ssl-opts-52379f89ccdb500d.yaml     | 10 ++++++
 2 files changed, 10 insertions(+), 35 deletions(-)
 create mode 100644 releasenotes/notes/remove-ssl-opts-52379f89ccdb500d.yaml

diff --git a/manifests/api.pp b/manifests/api.pp
index e356556e..52ae57ff 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -230,24 +230,6 @@
 #   (Optional) Default page size for the 'limit' paging URL parameter.
 #   Defaults to $::os_service_default
 #
-# DEPRECATED PARAMETERS
-#
-# [*use_ssl*]
-#   (optional) Enable SSL on the API server
-#   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
-#
 class barbican::api (
   $package_ensure                                = 'present',
   $bind_host                                     = '0.0.0.0',
@@ -295,11 +277,6 @@ class barbican::api (
   $max_request_body_size                         = $::os_service_default,
   $max_limit_paging                              = $::os_service_default,
   $default_limit_paging                          = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $use_ssl                                       = undef,
-  $ca_file                                       = undef,
-  $cert_file                                     = undef,
-  $key_file                                      = undef,
 ) inherits barbican::params {
 
   include barbican::deps
@@ -409,18 +386,6 @@ class barbican::api (
   # instead of using db_sync
   barbican_config { 'DEFAULT/db_auto_create': value => $db_auto_create }
 
-  [ 'use_ssl', '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.")
-    }
-  }
-  # SSL Options
-  barbican_config {
-    'DEFAULT/cert_file': ensure => absent;
-    'DEFAULT/key_file':  ensure => absent;
-    'DEFAULT/ca_file':   ensure => absent;
-  }
-
   if $sync_db {
     include barbican::db::sync
   }
diff --git a/releasenotes/notes/remove-ssl-opts-52379f89ccdb500d.yaml b/releasenotes/notes/remove-ssl-opts-52379f89ccdb500d.yaml
new file mode 100644
index 00000000..2e183d74
--- /dev/null
+++ b/releasenotes/notes/remove-ssl-opts-52379f89ccdb500d.yaml
@@ -0,0 +1,10 @@
+---
+upgrade:
+  - |
+    The following parameters of the ``barbican::api`` class have been removed.
+
+    - ``use_ssl``
+    - ``cert_file``
+    - ``key_file``
+    - ``ca_file``
+