Remove parameters for certificate plugins
Certificate plugins were removed from barbican during 2024.1 cycle[1]
and we deprecated these parameters during the same cycle[2], so we can
remove these now.
[1] 9833751613c6a552025f50a5dcd280dc6391ec32
[2] d2625af949
Change-Id: I321b4c2dd70664e5a45c97d1e605283e042f97f9
This commit is contained in:
parent
f62dcc9bee
commit
f7de20ccfd
@ -243,16 +243,6 @@
|
|||||||
# (Optional) Default page size for the 'limit' paging URL parameter.
|
# (Optional) Default page size for the 'limit' paging URL parameter.
|
||||||
# Defaults to $facts['os_service_default']
|
# 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 (
|
class barbican::api (
|
||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$bind_host = '0.0.0.0',
|
$bind_host = '0.0.0.0',
|
||||||
@ -303,9 +293,6 @@ class barbican::api (
|
|||||||
$max_request_body_size = $facts['os_service_default'],
|
$max_request_body_size = $facts['os_service_default'],
|
||||||
$max_limit_paging = $facts['os_service_default'],
|
$max_limit_paging = $facts['os_service_default'],
|
||||||
$default_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 {
|
) inherits barbican::params {
|
||||||
|
|
||||||
include barbican::deps
|
include barbican::deps
|
||||||
@ -313,12 +300,6 @@ class barbican::api (
|
|||||||
include barbican::client
|
include barbican::client
|
||||||
include barbican::policy
|
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':
|
package { 'barbican-api':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
name => $::barbican::params::api_package_name,
|
name => $::barbican::params::api_package_name,
|
||||||
@ -397,12 +378,6 @@ class barbican::api (
|
|||||||
'crypto/enabled_crypto_plugins': value => $enabled_crypto_plugins;
|
'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
|
# enabled plugins when multiple plugins is enabled
|
||||||
barbican_config {
|
barbican_config {
|
||||||
'secretstore/enable_multiple_secret_stores': value => $multiple_secret_stores_enabled;
|
'secretstore/enable_multiple_secret_stores': value => $multiple_secret_stores_enabled;
|
||||||
|
@ -31,20 +31,6 @@
|
|||||||
# (optional) set plugin as global default
|
# (optional) set plugin as global default
|
||||||
# Defaults to false
|
# 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 (
|
class barbican::plugins::dogtag (
|
||||||
$dogtag_plugin_nss_password,
|
$dogtag_plugin_nss_password,
|
||||||
$dogtag_plugin_ensure_package = 'present',
|
$dogtag_plugin_ensure_package = 'present',
|
||||||
@ -53,23 +39,11 @@ class barbican::plugins::dogtag (
|
|||||||
$dogtag_plugin_dogtag_port = $facts['os_service_default'],
|
$dogtag_plugin_dogtag_port = $facts['os_service_default'],
|
||||||
$dogtag_plugin_nss_db_path = $facts['os_service_default'],
|
$dogtag_plugin_nss_db_path = $facts['os_service_default'],
|
||||||
$global_default = false,
|
$global_default = false,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$dogtag_plugin_simple_cmc_profile = undef,
|
|
||||||
$dogtag_plugin_ca_expiration_time = undef,
|
|
||||||
$dogtag_plugin_plugin_working_dir = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include barbican::deps
|
include barbican::deps
|
||||||
include barbican::params
|
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':
|
package {'dogtag-client':
|
||||||
ensure => $dogtag_plugin_ensure_package,
|
ensure => $dogtag_plugin_ensure_package,
|
||||||
name => $::barbican::params::dogtag_client_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_db_path': value => $dogtag_plugin_nss_db_path;
|
||||||
'dogtag_plugin/nss_password': value => $dogtag_plugin_nss_password, secret => true;
|
'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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -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``
|
Loading…
Reference in New Issue
Block a user