diff options
| author | Christian G. Warden <cwarden@xerus.org> | 2012-02-02 18:10:14 -0800 |
|---|---|---|
| committer | Christian G. Warden <cwarden@xerus.org> | 2012-02-02 18:10:14 -0800 |
| commit | e2dfae5852ecdf3695a6af8ec48092ea24698390 (patch) | |
| tree | d655e7fbf5a12b2a622c83411b40397e512d01e1 /manifests/client | |
| parent | d8de9540534a3801c87278435934da3c88a69e4b (diff) | |
Fully qualify facter variables
Diffstat (limited to 'manifests/client')
| -rw-r--r-- | manifests/client/base.pp | 4 | ||||
| -rw-r--r-- | manifests/client/darwin.pp | 2 | ||||
| -rw-r--r-- | manifests/client/debian.pp | 4 | ||||
| -rw-r--r-- | manifests/client/openbsd.pp | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/manifests/client/base.pp b/manifests/client/base.pp index 6b4bef9..0c7a62a 100644 --- a/manifests/client/base.pp +++ b/manifests/client/base.pp @@ -12,11 +12,11 @@ class munin::client::base( mode => 0755, owner => root, group => 0; } file {'/etc/munin/munin-node.conf': - content => template("munin/munin-node.conf.$operatingsystem"), + content => template("munin/munin-node.conf.${::operatingsystem}"), notify => Service['munin-node'], mode => 0644, owner => root, group => 0, } - munin::register { $fqdn: + munin::register { $::fqdn: config => [ 'use_node_name yes', 'load.load.warning 5', 'load.load.critical 10'], } include munin::plugins::base diff --git a/manifests/client/darwin.pp b/manifests/client/darwin.pp index 92787ec..264263d 100644 --- a/manifests/client/darwin.pp +++ b/manifests/client/darwin.pp @@ -18,5 +18,5 @@ class munin::client::darwin { exec{"/sbin/SystemStarter start SNMP": noop => false, } - munin::register::snmp { $fqdn: } + munin::register::snmp { $::fqdn: } } diff --git a/manifests/client/debian.pp b/manifests/client/debian.pp index 97f5fbf..903fb2d 100644 --- a/manifests/client/debian.pp +++ b/manifests/client/debian.pp @@ -4,10 +4,10 @@ class munin::client::debian inherits munin::client::package { Service["munin-node"]{ # sarge's munin-node init script has no status - hasstatus => $lsbdistcodename ? { sarge => false, default => true } + hasstatus => $::lsbdistcodename ? { sarge => false, default => true } } File["/etc/munin/munin-node.conf"]{ - content => template("munin/munin-node.conf.$operatingsystem.$lsbdistcodename"), + content => template("munin/munin-node.conf.${::operatingsystem}.${::lsbdistcodename}"), } # workaround bug in munin_node_configure plugin { "postfix_mailvolume": ensure => absent } diff --git a/manifests/client/openbsd.pp b/manifests/client/openbsd.pp index 7012c00..e1742d2 100644 --- a/manifests/client/openbsd.pp +++ b/manifests/client/openbsd.pp @@ -1,7 +1,7 @@ # currently we install munin on openbsd by targz # :( class munin::client::openbsd inherits munin::client::base { - if $operatingsystemrelease == '4.3' { + if $::operatingsystemrelease == '4.3' { file{'/usr/src/munin_openbsd.tar.gz': source => "puppet:///modules/munin/openbsd/package/munin_openbsd.tar.gz", owner => root, group => 0, mode => 0600; @@ -32,7 +32,7 @@ class munin::client::openbsd inherits munin::client::base { owner => root, group => 0, mode => 0755; } openbsd::rc_local{'munin-node': - binary => $operatingsystemrelease ? { + binary => $::operatingsystemrelease ? { '4.3' => '/opt/munin/sbin/munin-node', default => '/usr/local/sbin/munin-node' }, @@ -41,7 +41,7 @@ class munin::client::openbsd inherits munin::client::base { Service['munin-node']{ restart => '/bin/kill -HUP `/bin/cat /var/run/munin/munin-node.pid`', stop => '/bin/kill `/bin/cat /var/run/munin/munin-node.pid`', - start => $operatingsystemrelease ? { + start => $::operatingsystemrelease ? { '4.3' => '/opt/munin/sbin/munin-node', default => '/usr/local/sbin/munin-node' }, |