openstack
/
puppet-barbican
Code Issues Proposed changes

Merge "Refactor how a required parameter is defined"

This commit is contained in:
Zuul 2022-03-30 08:32:33 +00:00 committed by Gerrit Code Review
parent 111ea8b69d b32a729536
commit 0ac6151d68
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/plugins/dogtag.pp
View File

@ -4,6 +4,9 @@
# #
# === Parameters # === Parameters
# #
# [*dogtag_plugin_nss_password*]
# (required) Password for plugin NSS DB
#
# [*dogtag_plugin_ensure_package*] # [*dogtag_plugin_ensure_package*]
# (optional) State of the dogtag client packages # (optional) State of the dogtag client packages
# Defaults to 'present' # Defaults to 'present'
@ -24,10 +27,6 @@
# (optional) Path to plugin NSS DB # (optional) Path to plugin NSS DB
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*dogtag_plugin_nss_password*]
# Password for plugin NSS DB
# Defaults to undef
#
# [*dogtag_plugin_simple_cmc_profile*] # [*dogtag_plugin_simple_cmc_profile*]
# (optional) Profile for simple CMC enrollment. # (optional) Profile for simple CMC enrollment.
# Defaults to $::os_service_default # Defaults to $::os_service_default
@ -45,12 +44,12 @@
# Defaults to false # Defaults to false
# #
class barbican::plugins::dogtag ( class barbican::plugins::dogtag (
$dogtag_plugin_nss_password,
$dogtag_plugin_ensure_package = 'present', $dogtag_plugin_ensure_package = 'present',
$dogtag_plugin_pem_path = $::os_service_default, $dogtag_plugin_pem_path = $::os_service_default,
$dogtag_plugin_dogtag_host = $::os_service_default, $dogtag_plugin_dogtag_host = $::os_service_default,
$dogtag_plugin_dogtag_port = $::os_service_default, $dogtag_plugin_dogtag_port = $::os_service_default,
$dogtag_plugin_nss_db_path = $::os_service_default, $dogtag_plugin_nss_db_path = $::os_service_default,
$dogtag_plugin_nss_password = undef,
$dogtag_plugin_simple_cmc_profile = $::os_service_default, $dogtag_plugin_simple_cmc_profile = $::os_service_default,
$dogtag_plugin_ca_expiration_time = $::os_service_default, $dogtag_plugin_ca_expiration_time = $::os_service_default,
$dogtag_plugin_plugin_working_dir = $::os_service_default, $dogtag_plugin_plugin_working_dir = $::os_service_default,
@ -60,10 +59,6 @@ class barbican::plugins::dogtag (
include barbican::deps include barbican::deps
include barbican::params include barbican::params
if $dogtag_plugin_nss_password == undef {
fail('dogtag_plugin_nss_password must be defined')
}
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,