Skip to content

Commit 3a469e7

Browse files
author
Joshua Hoblitt
committed
simplify udev::rule implementation
1 parent a69f1b8 commit 3a469e7

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

manifests/rule.pp

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,12 @@
5454
if $content {
5555
fail("${title}: parameters \$source and \$content are mutually exclusive")
5656
}
57-
58-
$safe_source = { source => $source }
5957
} elsif $content {
6058
validate_string($content)
6159

6260
if $source {
6361
fail("${title}: parameters \$source and \$content are mutually exclusive")
6462
}
65-
66-
$safe_content = { content => $content }
6763
} else {
6864
# one of $source or $content is required unless we're removing the file,
6965
if $ensure != 'absent' {
@@ -76,15 +72,11 @@
7672
owner => 'root',
7773
group => 'root',
7874
mode => '0644',
75+
content => $content,
76+
source => $source,
7977
notify => Class['udev::udevadm::trigger'],
8078
}
8179

82-
$safe_config = merge(
83-
$config,
84-
$safe_source,
85-
$safe_content
86-
)
87-
88-
create_resources( 'file', { "/etc/udev/rules.d/${title}" => $safe_config } )
80+
create_resources( 'file', { "/etc/udev/rules.d/${title}" => $config } )
8981

9082
}

0 commit comments

Comments
 (0)