Skip to content

Commit b8b8c22

Browse files
committed
Eliminate default private key parameter value
We have observed setting r10k_private_key by default can cause conflicts with advanced code manager configuration keys passed in by pe_conf_data. To avoid the need to zero-out the r10k_private_key value, if the top-level r10k_private_key settings are not given to peadm::provision, do not set a pe.conf value for r10k_private_key.
1 parent 83eb2c1 commit b8b8c22

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

plans/action/install.pp

+4-1
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,11 @@
129129
'pe_install::puppet_master_dnsaltnames' => $dns_alt_names,
130130
'puppet_enterprise::puppetdb_database_host' => $puppetdb_database_target.peadm::target_name(),
131131
'puppet_enterprise::profile::master::code_manager_auto_configure' => true,
132-
'puppet_enterprise::profile::master::r10k_private_key' => '/etc/puppetlabs/puppetserver/ssh/id-control_repo.rsa',
133132
'puppet_enterprise::profile::master::r10k_remote' => $r10k_remote,
133+
'puppet_enterprise::profile::master::r10k_private_key' => $r10k_private_key ? {
134+
undef => undef,
135+
default => '/etc/puppetlabs/puppetserver/ssh/id-control_repo.rsa',
136+
},
134137
} + $pe_conf_data)
135138

136139
$puppetdb_database_pe_conf = peadm::generate_pe_conf({

0 commit comments

Comments
 (0)