From be4f369b20c8c0e52b6e97c623837168f7461ae7 Mon Sep 17 00:00:00 2001 From: Andrew Teixeira <teixeira@broadinstitute.org> Date: Fri, 11 Aug 2023 09:49:26 -0400 Subject: [PATCH] a --- manifests/candlepin.pp | 4 ++-- manifests/init.pp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/candlepin.pp b/manifests/candlepin.pp index 59cd6a76..964aa3ea 100644 --- a/manifests/candlepin.pp +++ b/manifests/candlepin.pp @@ -72,10 +72,10 @@ # Generate and cache the password on the master once # In multi-puppetmaster setups, the user should specify their own - $final_keystore_password = pick_default( + $final_keystore_password = pick( $keystore_password, extlib::cache_data('foreman_cache_data', $keystore_password_file, extlib::random_password(32)) ) - $final_truststore_password = pick_default( + $final_truststore_password = pick( $truststore_password, extlib::cache_data('foreman_cache_data', $truststore_password_file, extlib::random_password(32)) ) $keystore_password_path = "${pki_dir}/${keystore_password_file}" diff --git a/manifests/init.pp b/manifests/init.pp index aa1208d3..e04d682f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -75,7 +75,7 @@ Boolean $generate = true, Boolean $regenerate = false, Boolean $deploy = true, - String[1] $ca_key_password = $certs::params::ca_key_password, + String[10] $ca_key_password = $certs::params::ca_key_password, String $ca_common_name = $certs::params::ca_common_name, String[2,2] $country = 'US', String $state = 'North Carolina',