Skip to content

Commit 324446c

Browse files
committed
Code reduction for compiler installs
DRY up the code a bit
1 parent ff8502e commit 324446c

File tree

1 file changed

+13
-24
lines changed

1 file changed

+13
-24
lines changed

plans/action/install.pp

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -297,30 +297,19 @@
297297
],
298298
)
299299

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-
}
312-
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-
)
300+
['A', 'B'].each |$group| {
301+
getvar("compiler_${group.downcase()}_targets").each |$target| {
302+
run_task('peadm::agent_install', $target,
303+
server => $master_target.peadm::target_name(),
304+
install_flags => [
305+
'--puppet-service-ensure', 'stopped',
306+
"main:certname=${target.peadm::target_name()}",
307+
"main:dns_alt_names=${dns_alt_names_csv}",
308+
"extension_requests:${pp_application}=puppet/compiler",
309+
"extension_requests:${pp_cluster}=${group}",
310+
],
311+
)
312+
}
324313
}
325314

326315
# Ensure certificate requests have been submitted

0 commit comments

Comments
 (0)