Skip to content

Commit 3635518

Browse files
authored
Merge pull request #112 from jcpunk/also-extlib
Also permit puppet-extlib to provide the puppet_config directory
2 parents ceb2dda + 640078c commit 3635518

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

manifests/init.pp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,18 @@
151151
fail("High Priority Patch group ${high_priority_patch_group} is not valid as no associated schedule was found!\nEnsure the patching_as_code::patch_schedule parameter contains a schedule for this patch group.") #lint:ignore:140chars
152152
}
153153

154-
# Verify the puppet_confdir from the puppetlabs/puppet_agent module is present
155-
unless $facts['puppet_confdir'] {
156-
fail('The puppetlabs/patching_as_code module depends on the puppetlabs/puppet_agent module, please add it to your setup!')
154+
# Verify the puppet_confdir is present
155+
if len($facts['puppet_confdir']) > 0 {
156+
$puppet_confdir = $facts['puppet_confdir']
157+
} elsif len($facts['extlib__puppet_config']['confdir']) > 0 {
158+
$puppet_confdir = $facts['extlib__puppet_config']['confdir']
159+
}
160+
} else {
161+
fail('The puppetlabs/patching_as_code module depends on the puppetlabs/puppet_agent module or puppet/extlib, please add one to your setup!')
157162
}
158163

159164
# Write local config file for unsafe processes
160-
file { "${facts['puppet_confdir']}/patching_unsafe_processes":
165+
file { "${puppet_confdir}/patching_unsafe_processes":
161166
ensure => file,
162167
content => $unsafe_process_list.join("\n"),
163168
show_diff => false,

metadata.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
"name": "puppetlabs/puppet_agent",
2121
"version_requirement": ">= 4.0.0 < 6.0.0"
2222
},
23+
{
24+
"name": "puppet/extlib",
25+
"version_requirement": ">= 7.5.0 < 8.0.0"
26+
},
2327
{
2428
"name": "puppetlabs/reboot",
2529
"version_requirement": ">= 2.4.0 < 6.0.0"

0 commit comments

Comments
 (0)