api: Remove deprecated ssl parameters

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

[1] 109ea49acb

Change-Id: I6471ed0fe696f2c6455150adc63c9c896037e404
This commit is contained in:
Takashi Kajinami 2023-01-06 13:06:17 +09:00
parent a79ac82ef2
commit 9c6f3af402
2 changed files with 10 additions and 35 deletions

View File

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

View File

@ -0,0 +1,10 @@
---
upgrade:
- |
The following parameters of the ``barbican::api`` class have been removed.
- ``use_ssl``
- ``cert_file``
- ``key_file``
- ``ca_file``