opuppet/module-icinga2
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

only check some params if the "default" erb template is used. Also allow for "static" templates and files to be set in pace of "default" erb

Browse source 
Signed-off-by: Nick Chappell <nick@intronic.org>

Merged from: https://github.com/Icinga/puppet-icinga2/pull/35

refs#7628: https://dev.icinga.org/issues/7628
This commit is contained in:
Steven Bambling 2014-10-23 13:19:46 -04:00 committed by Nick Chappell
parent 46298909ed
commit e7710c6d2d
1 changed files with 52 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
manifests/object/checkcommand.pp
View file

@ -22,14 +22,17 @@ define icinga2::object::checkcommand (
$target_dir = '/etc/icinga2/objects/checkcommands', $target_dir = '/etc/icinga2/objects/checkcommands',
$checkcommand_template_module = 'icinga2', $checkcommand_template_module = 'icinga2',
$checkcommand_template = 'object_checkcommand.conf.erb', $checkcommand_template = 'object_checkcommand.conf.erb',
$checkcommand_source_file = undef,
$checkcommand_file_distribution_method = 'content',
$target_file_name = "${name}.conf", $target_file_name = "${name}.conf",
$target_file_owner = 'root', $target_file_owner = 'root',
$target_file_group = 'root', $target_file_group = 'root',
$target_file_mode = '0644' $target_file_mode = '0644',
) { ) {
#Do some validation of the class' parameters: #Do some validation of the class' parameters:
validate_string($object_checkcommandname) validate_string($object_checkcommandname)
if $checkcommand_template == 'object_checkcommand.conf.erb' {
validate_string($template_to_import) validate_string($template_to_import)
validate_array($command) validate_array($command)
validate_string($cmd_path) validate_string($cmd_path)
@ -40,6 +43,7 @@ define icinga2::object::checkcommand (
if $timeout { if $timeout {
validate_re($timeout, '^\d+$') validate_re($timeout, '^\d+$')
} }
}
validate_string($target_dir) validate_string($target_dir)
validate_string($target_file_name) validate_string($target_file_name)
validate_string($target_file_owner) validate_string($target_file_owner)
@ -47,6 +51,7 @@ define icinga2::object::checkcommand (
validate_re($target_file_mode, '^\d{4}$') validate_re($target_file_mode, '^\d{4}$')
if $checkcommand_file_distribution_method == 'content' {
file {"${target_dir}/${target_file_name}": file {"${target_dir}/${target_file_name}":
ensure => file, ensure => file,
owner => $target_file_owner, owner => $target_file_owner,
@ -55,5 +60,20 @@ define icinga2::object::checkcommand (
content => template("${checkcommand_template_module}/${checkcommand_template}"), content => template("${checkcommand_template_module}/${checkcommand_template}"),
notify => Service['icinga2'], notify => Service['icinga2'],
} }
}
elsif $checkcommand_file_distribution_method == 'source' {
file {"${target_dir}/${target_file_name}":
ensure => file,
owner => $target_file_owner,
group => $target_file_group,
mode => $target_file_mode,
source => $checkcommand_source_file,
notify => Service['icinga2'],
}
}
else {
notify {'Missing/Incorrect File Distribution Method':
message => 'The parameter checkcommand_file_distribution_method is missing or incorrect. Please set content or source',
}
}
} }