From e2dfae5852ecdf3695a6af8ec48092ea24698390 Mon Sep 17 00:00:00 2001 From: "Christian G. Warden" Date: Thu, 2 Feb 2012 18:10:14 -0800 Subject: Fully qualify facter variables --- manifests/client.pp | 2 +- manifests/client/base.pp | 4 ++-- manifests/client/darwin.pp | 2 +- manifests/client/debian.pp | 4 ++-- manifests/client/openbsd.pp | 6 +++--- manifests/host.pp | 6 +++--- manifests/host/cgi.pp | 6 +++--- manifests/plugin.pp | 2 +- manifests/plugin/deploy.pp | 2 +- manifests/plugin/scriptpaths.pp | 4 ++-- manifests/plugins/base.pp | 2 +- manifests/plugins/interfaces.pp | 2 +- manifests/plugins/physical.pp | 2 +- manifests/plugins/setup.pp | 2 +- manifests/register.pp | 4 ++-- manifests/register/snmp.pp | 2 +- templates/client.erb | 4 ++-- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/manifests/client.pp b/manifests/client.pp index 99480f1..0ff5b79 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -5,7 +5,7 @@ class munin::client { - case $operatingsystem { + case $::operatingsystem { openbsd: { include munin::client::openbsd } darwin: { include munin::client::darwin } debian,ubuntu: { include munin::client::debian } 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' }, diff --git a/manifests/host.pp b/manifests/host.pp index 107cd39..c424e94 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -9,10 +9,10 @@ class munin::host { concat::fragment{'munin.conf.header': target => '/etc/munin/munin.conf', - source => [ "puppet:///modules/site-munin/config/host/${fqdn}/munin.conf.header", - "puppet:///modules/site-munin/config/host/munin.conf.header.$operatingsystem", + source => [ "puppet:///modules/site-munin/config/host/${::fqdn}/munin.conf.header", + "puppet:///modules/site-munin/config/host/munin.conf.header.${::operatingsystem}", "puppet:///modules/site-munin/config/host/munin.conf.header", - "puppet:///modules/munin/config/host/munin.conf.header.$operatingsystem", + "puppet:///modules/munin/config/host/munin.conf.header.${::operatingsystem}", "puppet:///modules/munin/config/host/munin.conf.header" ], order => 05, } diff --git a/manifests/host/cgi.pp b/manifests/host/cgi.pp index 6fd50df..283a243 100644 --- a/manifests/host/cgi.pp +++ b/manifests/host/cgi.pp @@ -6,10 +6,10 @@ class munin::host::cgi { } file{'/etc/logrotate.d/munin': - source => [ "puppet:///modules/site-munin/config/host/${fqdn}/logrotate", - "puppet:///modules/site-munin/config/host/logrotate.$operatingsystem", + source => [ "puppet:///modules/site-munin/config/host/${::fqdn}/logrotate", + "puppet:///modules/site-munin/config/host/logrotate.${::operatingsystem}", "puppet:///modules/site-munin/config/host/logrotate", - "puppet:///modules/munin/config/host/logrotate.$operatingsystem", + "puppet:///modules/munin/config/host/logrotate.${::operatingsystem}", "puppet:///modules/munin/config/host/logrotate" ], owner => root, group => 0, mode => 0644; } diff --git a/manifests/plugin.pp b/manifests/plugin.pp index 69b7322..51de48a 100644 --- a/manifests/plugin.pp +++ b/manifests/plugin.pp @@ -21,7 +21,7 @@ define munin::plugin ( file { $plugin: ensure => absent, } } default: { - case $kernel { + case $::kernel { openbsd: { $basic_require = File['/var/run/munin'] } default: { $basic_require = Package['munin-node'] } } diff --git a/manifests/plugin/deploy.pp b/manifests/plugin/deploy.pp index 67cbfb8..7de8d45 100644 --- a/manifests/plugin/deploy.pp +++ b/manifests/plugin/deploy.pp @@ -15,7 +15,7 @@ define munin::plugin::deploy($source = '', $ensure = 'present', $config = '') { mode => 0755, owner => root, group => 0; } - case $kernel { + case $::kernel { openbsd: { $basic_require = File['/var/run/munin'] } default: { $basic_require = Package['munin-node'] } } diff --git a/manifests/plugin/scriptpaths.pp b/manifests/plugin/scriptpaths.pp index 164a17e..f4bd39b 100644 --- a/manifests/plugin/scriptpaths.pp +++ b/manifests/plugin/scriptpaths.pp @@ -1,9 +1,9 @@ class munin::plugin::scriptpaths { - case $operatingsystem { + case $::operatingsystem { gentoo: { $script_path = "/usr/libexec/munin/plugins" } debian: { $script_path = "/usr/share/munin/plugins" } centos: { $script_path = "/usr/share/munin/plugins" } - openbsd: { $script_path = $operatingsystemrelease ? { + openbsd: { $script_path = $::operatingsystemrelease ? { '4.3' => '/opt/munin/lib/plugins/', default => '/usr/local/libexec/munin/plugins/' } } diff --git a/manifests/plugins/base.pp b/manifests/plugins/base.pp index 007579c..972a674 100644 --- a/manifests/plugins/base.pp +++ b/manifests/plugins/base.pp @@ -7,7 +7,7 @@ class munin::plugins::base { } include munin::plugins::interfaces - case $kernel { + case $::kernel { openbsd: { include munin::plugins::openbsd } linux: { case $vserver { diff --git a/manifests/plugins/interfaces.pp b/manifests/plugins/interfaces.pp index 18a713b..b2c448b 100644 --- a/manifests/plugins/interfaces.pp +++ b/manifests/plugins/interfaces.pp @@ -5,7 +5,7 @@ class munin::plugins::interfaces { munin::plugin { $ifs: ensure => "if_"; } - case $operatingsystem { + case $::operatingsystem { openbsd: { $if_errs = regsubst(split($interfaces, " |,"), "(.+)", "if_errcoll_\\1") munin::plugin{ diff --git a/manifests/plugins/physical.pp b/manifests/plugins/physical.pp index ac050a5..a1c27a7 100644 --- a/manifests/plugins/physical.pp +++ b/manifests/plugins/physical.pp @@ -1,5 +1,5 @@ class munin::plugins::physical { - case $kernel { + case $::kernel { linux: { munin::plugin { iostat: } } } } diff --git a/manifests/plugins/setup.pp b/manifests/plugins/setup.pp index c88f9e0..caf2e28 100644 --- a/manifests/plugins/setup.pp +++ b/manifests/plugins/setup.pp @@ -11,7 +11,7 @@ class munin::plugins::setup { mode => 0644, owner => root, group => 0, notify => Service['munin-node'], } - case $kernel { + case $::kernel { openbsd: { File['/etc/munin/plugin-conf.d/munin-node']{ before => File['/var/run/munin'], diff --git a/manifests/register.pp b/manifests/register.pp index 3c542ff..254eaaf 100644 --- a/manifests/register.pp +++ b/manifests/register.pp @@ -16,8 +16,8 @@ define munin::register ( $hiera_munin_host = hiera('munin_host','') $munin_host_real = $host ? { 'absent' => $hiera_munin_host ? { - '' => $fqdn, - 'fqdn' => $fqdn, + '' => $::fqdn, + 'fqdn' => $::fqdn, default => $hiera_munin_host }, default => $host diff --git a/manifests/register/snmp.pp b/manifests/register/snmp.pp index a4d0d88..acd1e03 100644 --- a/manifests/register/snmp.pp +++ b/manifests/register/snmp.pp @@ -5,7 +5,7 @@ define munin::register::snmp ( ) { $fhost = $name - $munin_host_real = $fqdn + $munin_host_real = $::fqdn $client_type = 'snmp' $config = [ 'use_node_name no' ] diff --git a/templates/client.erb b/templates/client.erb index 3e8ab39..8c93cc5 100644 --- a/templates/client.erb +++ b/templates/client.erb @@ -1,7 +1,7 @@ <% # Downcase all information - dom = domain.downcase - host = hostname.downcase + dom = scope.lookupvar('::domain').downcase + host = scope.lookupvar('::hostname').downcase %> ### Munin client from Puppet template -- cgit v1.2.3