tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More instance variable cleanup

Browse source
This commit is contained in:
Ossi Salmi 2013-05-24 10:29:11 +03:00
parent 49a8ae3004
commit 0e4f99b1bc
9 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nagios/manifests/init.pp
View file

@ -308,7 +308,7 @@ class nagios::server inherits nagios::server::manual {
define nagios::contact::email($group=["all"],
$confdir=$nagios::common::confdir) {
$contactgroups = inline_template('<%= group.join(",") -%>')
$contactgroups = inline_template('<%= @group.join(",") -%>')
file { "${confdir}/contact_${name}.cfg":
ensure => present,
@ -346,7 +346,7 @@ define nagios::contact::email($group=["all"],
define nagios::contact::prowl($group=["all"],
$confdir=$nagios::common::confdir) {
$contactgroups = inline_template('<%= group.join(",") -%>')
$contactgroups = inline_template('<%= @group.join(",") -%>')
file { "${confdir}/contact_prowl_${name}.cfg":
ensure => present,
@ -386,7 +386,7 @@ define nagios::contact::prowl($group=["all"],
define nagios::contact::pushover($token, $group=["all"],
$confdir=$nagios::common::confdir) {
$contactgroups = inline_template('<%= group.join(",") -%>')
$contactgroups = inline_template('<%= @group.join(",") -%>')
file { "${confdir}/contact_pushover_${name}.cfg":
ensure => present,
@ -448,7 +448,7 @@ define nagios::host($address=undef, $group="NONE", $osname="NONE",
use => "default",
target => "${confdir}/host_${name}.cfg",
parents => is_array($parent) ? {
true => inline_template('<%= parent.join(",") -%>'),
true => inline_template('<%= @parent.join(",") -%>'),
false => $parent,
},
notify => Service["nagios"],

2
nagios/manifests/target.pp
View file

@ -27,7 +27,7 @@ class nagios::target($parent=undef) {
osname => $::operatingsystem,
osicon => $::osfamily ? {
"" => "NONE",
default => inline_template("<%= osfamily.downcase %>")
default => inline_template("<%= @osfamily.downcase %>")
},
parent => $parent,
}