Skip to content

Commit

Permalink
Merge pull request jhoblitt#6 from oholiab/master
Browse files Browse the repository at this point in the history
Case out unused parameters in rules.pp
  • Loading branch information
Joshua Hoblitt committed Sep 22, 2014
2 parents f212f03 + a9ac08d commit 7ae9cb7
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions manifests/rule.pp
Original file line number Diff line number Diff line change
Expand Up @@ -48,34 +48,38 @@
include udev

# only $source or $content are allowed

$config_base = {
ensure => $ensure,
owner => 'root',
group => 'root',
mode => '0644',
notify => Class['udev::udevadm::trigger'],
}
if $source {
validate_string($source)

if $content {
fail("${title}: parameters \$source and \$content are mutually exclusive")
}
$config_content = { source => $source }
} elsif $content {
validate_string($content)

if $source {
fail("${title}: parameters \$source and \$content are mutually exclusive")
}
$config_content = { content => $content }
} else {
# one of $source or $content is required unless we're removing the file,
if $ensure != 'absent' {
fail("${title}: parameter \$source or \$content is required")
} else {
$config_content = {}
}
}

$config = {
ensure => $ensure,
owner => 'root',
group => 'root',
mode => '0644',
content => $content,
source => $source,
notify => Class['udev::udevadm::trigger'],
}
$config = merge($config_base, $config_content)

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

Expand Down

0 comments on commit 7ae9cb7

Please sign in to comment.