Skip to content

Commit ff8502e

Browse files
committed
Set explicit certname when using curl|bash install
This is because the curl|bash installer overrides certname and server settings when installing. In the event a server needs to use a certname which is NOT the same as the system's configured hostname, the certname must be set manually at agent install time.
1 parent 9b59b32 commit ff8502e

File tree

1 file changed

+25
-18
lines changed

1 file changed

+25
-18
lines changed

plans/action/install.pp

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -290,31 +290,38 @@
290290
server => $master_target.peadm::target_name(),
291291
install_flags => [
292292
'--puppet-service-ensure', 'stopped',
293+
"main:certname=${master_replica_target.peadm::target_name()}",
293294
"main:dns_alt_names=${dns_alt_names_csv}",
294295
"extension_requests:${pp_application}=puppet/master",
295296
"extension_requests:${pp_cluster}=B",
296297
],
297298
)
298299

299-
run_task('peadm::agent_install', $compiler_a_targets,
300-
server => $master_target.peadm::target_name(),
301-
install_flags => [
302-
'--puppet-service-ensure', 'stopped',
303-
"main:dns_alt_names=${dns_alt_names_csv}",
304-
"extension_requests:${pp_application}=puppet/compiler",
305-
"extension_requests:${pp_cluster}=A",
306-
],
307-
)
300+
$compiler_a_targets.each |$target| {
301+
run_task('peadm::agent_install', $target,
302+
server => $master_target.peadm::target_name(),
303+
install_flags => [
304+
'--puppet-service-ensure', 'stopped',
305+
"main:certname=${target.peadm::target_name()}",
306+
"main:dns_alt_names=${dns_alt_names_csv}",
307+
"extension_requests:${pp_application}=puppet/compiler",
308+
"extension_requests:${pp_cluster}=A",
309+
],
310+
)
311+
}
308312

309-
run_task('peadm::agent_install', $compiler_b_targets,
310-
server => $master_target.peadm::target_name(),
311-
install_flags => [
312-
'--puppet-service-ensure', 'stopped',
313-
"main:dns_alt_names=${dns_alt_names_csv}",
314-
"extension_requests:${pp_application}=puppet/compiler",
315-
"extension_requests:${pp_cluster}=B",
316-
],
317-
)
313+
$compiler_b_targets.each |$target| {
314+
run_task('peadm::agent_install', $target,
315+
server => $master_target.peadm::target_name(),
316+
install_flags => [
317+
'--puppet-service-ensure', 'stopped',
318+
"main:certname=${target.peadm::target_name()}",
319+
"main:dns_alt_names=${dns_alt_names_csv}",
320+
"extension_requests:${pp_application}=puppet/compiler",
321+
"extension_requests:${pp_cluster}=B",
322+
],
323+
)
324+
}
318325

319326
# Ensure certificate requests have been submitted
320327
run_task('peadm::submit_csr', $agent_installer_targets)

0 commit comments

Comments
 (0)