Skip to content

Commit be4f369

Browse files
committed
a
1 parent 27f87c8 commit be4f369

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

manifests/candlepin.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@
7272

7373
# Generate and cache the password on the master once
7474
# In multi-puppetmaster setups, the user should specify their own
75-
$final_keystore_password = pick_default(
75+
$final_keystore_password = pick(
7676
$keystore_password, extlib::cache_data('foreman_cache_data', $keystore_password_file, extlib::random_password(32))
7777
)
78-
$final_truststore_password = pick_default(
78+
$final_truststore_password = pick(
7979
$truststore_password, extlib::cache_data('foreman_cache_data', $truststore_password_file, extlib::random_password(32))
8080
)
8181
$keystore_password_path = "${pki_dir}/${keystore_password_file}"

manifests/init.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
Boolean $generate = true,
7676
Boolean $regenerate = false,
7777
Boolean $deploy = true,
78-
String[1] $ca_key_password = $certs::params::ca_key_password,
78+
String[10] $ca_key_password = $certs::params::ca_key_password,
7979
String $ca_common_name = $certs::params::ca_common_name,
8080
String[2,2] $country = 'US',
8181
String $state = 'North Carolina',

0 commit comments

Comments
 (0)