Skip to content

Commit a9ac08d

Browse files
committed
Case out unused parameters in rules.pp
Was breaking because of empty source in puppet 3.6.2
1 parent f936f90 commit a9ac08d

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

manifests/rule.pp

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,34 +48,38 @@
4848
include udev
4949

5050
# only $source or $content are allowed
51+
52+
$config_base = {
53+
ensure => $ensure,
54+
owner => 'root',
55+
group => 'root',
56+
mode => '0644',
57+
notify => Class['udev::udevadm::trigger'],
58+
}
5159
if $source {
5260
validate_string($source)
5361

5462
if $content {
5563
fail("${title}: parameters \$source and \$content are mutually exclusive")
5664
}
65+
$config_content = { source => $source }
5766
} elsif $content {
5867
validate_string($content)
5968

6069
if $source {
6170
fail("${title}: parameters \$source and \$content are mutually exclusive")
6271
}
72+
$config_content = { content => $content }
6373
} else {
6474
# one of $source or $content is required unless we're removing the file,
6575
if $ensure != 'absent' {
6676
fail("${title}: parameter \$source or \$content is required")
77+
} else {
78+
$config_content = {}
6779
}
6880
}
6981

70-
$config = {
71-
ensure => $ensure,
72-
owner => 'root',
73-
group => 'root',
74-
mode => '0644',
75-
content => $content,
76-
source => $source,
77-
notify => Class['udev::udevadm::trigger'],
78-
}
82+
$config = merge($config_base, $config_content)
7983

8084
create_resources( 'file', { "/etc/udev/rules.d/${title}" => $config } )
8185

0 commit comments

Comments
 (0)