openstack
/
puppet-barbican
Code Issues Proposed changes

Merge "Remove parameters for certificate plugins"

This commit is contained in:
Zuul 2024-04-26 03:54:29 +00:00 committed by Gerrit Code Review
parent 160f279eed 475bdd260f
commit 7c14bfa18e
3 changed files with 16 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
manifests/api.pp
View File

@ -243,16 +243,6 @@
# (Optional) Default page size for the 'limit' paging URL parameter.
# Defaults to $facts['os_service_default']
#
# DEPRECATED PARAMETERS
#
# [*enabled_certificate_plugins*]
# (optional) Enabled certificate plugins as a list.
# Defaults to undef
#
# [*enabled_certificate_event_plugins*]
# (optional) Enabled certificate event plugins as a list
# Defaults to undef
#
class barbican::api (
$package_ensure = 'present',
$bind_host = '0.0.0.0',
@ -303,9 +293,6 @@ class barbican::api (
$max_request_body_size = $facts['os_service_default'],
$max_limit_paging = $facts['os_service_default'],
$default_limit_paging = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$enabled_certificate_plugins = undef,
$enabled_certificate_event_plugins = undef,
) inherits barbican::params {
include barbican::deps
@ -313,12 +300,6 @@ class barbican::api (
include barbican::client
include barbican::policy
['enabled_certificate_plugins', 'enabled_certificate_event_plugins'].each |String $opt| {
if getvar($opt) != undef {
warning("The ${opt} parameter has been deprecated and has no effect.")
}
}
package { 'barbican-api':
ensure => $package_ensure,
name => $::barbican::params::api_package_name,
@ -397,12 +378,6 @@ class barbican::api (
'crypto/enabled_crypto_plugins': value => $enabled_crypto_plugins;
}
# TODO(tkajinam): Remove this after 2024.1 release
barbican_config {
'certificate/enabled_certificate_plugins': ensure => absent;
'certificate_event/enabled_certificate_event_plugins': ensure => absent;
}
# enabled plugins when multiple plugins is enabled
barbican_config {
'secretstore/enable_multiple_secret_stores': value => $multiple_secret_stores_enabled;

45
manifests/plugins/dogtag.pp
View File

@ -31,45 +31,19 @@
# (optional) set plugin as global default
# Defaults to false
#
# DEPRECATED PARAMETERS
#
# [*dogtag_plugin_simple_cmc_profile*]
# (optional) Profile for simple CMC enrollment.
# Defaults to $facts['os_service_default']
#
# [*dogtag_plugin_ca_expiration_time*]
# (optional) Expiration time for the Dogtag CA entry in days
# Defaults to $facts['os_service_default']
#
# [*dogtag_plugin_plugin_working_dir*]
# (optional) Working directory for Dogtag plugin
# Defaults to $facts['os_service_default']
#
class barbican::plugins::dogtag (
$dogtag_plugin_nss_password,
$dogtag_plugin_ensure_package = 'present',
$dogtag_plugin_pem_path = $facts['os_service_default'],
$dogtag_plugin_dogtag_host = $facts['os_service_default'],
$dogtag_plugin_dogtag_port = $facts['os_service_default'],
$dogtag_plugin_nss_db_path = $facts['os_service_default'],
$global_default = false,
# DEPRECATED PARAMETERS
$dogtag_plugin_simple_cmc_profile = undef,
$dogtag_plugin_ca_expiration_time = undef,
$dogtag_plugin_plugin_working_dir = undef,
$dogtag_plugin_ensure_package = 'present',
$dogtag_plugin_pem_path = $facts['os_service_default'],
$dogtag_plugin_dogtag_host = $facts['os_service_default'],
$dogtag_plugin_dogtag_port = $facts['os_service_default'],
$dogtag_plugin_nss_db_path = $facts['os_service_default'],
$global_default = false,
) {
include barbican::deps
include barbican::params
[
'simple_cmc_profile', 'ca_expiration_time', 'plugin_working_dir'
].each |String $opt| {
if getvar("dogtag_plugin_${opt}") != undef {
warning("The dogtag_plugin_${opt} parameter has been deprecated and has no effect")
}
}
package {'dogtag-client':
ensure => $dogtag_plugin_ensure_package,
name => $::barbican::params::dogtag_client_package,
@ -88,11 +62,4 @@ class barbican::plugins::dogtag (
'dogtag_plugin/nss_db_path': value => $dogtag_plugin_nss_db_path;
'dogtag_plugin/nss_password': value => $dogtag_plugin_nss_password, secret => true;
}
# TODO(tkajinam): Remove this after 2024.1 release
barbican_config {
'dogtag_plugin/simple_cmc_profile': ensure => absent;
'dogtag_plugin/ca_expiration_time': ensure => absent;
'dogtag_plugin/plugin_working_dir': ensure => absent;
}
}

10
releasenotes/notes/remove-certificate-plugin-opts-d59847041c1d19fb.yaml Normal file
View File

@ -0,0 +1,10 @@
---
upgrade:
- |
The following deprecated parameters have been removed.
- ``barbican::api::enabled_certificate_plugins``
- ``barbican::api::enabled_certificate_event_plugins``
- ``barbican::plugins::dogtag::dogtag_plugin_simple_cmc_profile``
- ``barbican::plugins::dogtag::dogtag_plugin_ca_expiration_time``
- ``barbican::plugins::dogtag::dogtag_plugin_plugin_working_dir``