summaryrefslogtreecommitdiff
path: root/manifests/defaults
diff options
context:
space:
mode:
authorChristian G. Warden <cwarden@xerus.org>2012-02-01 16:56:49 -0800
committerMicah Anderson <micah@riseup.net>2012-04-18 12:27:17 -0400
commit32da5faa192dc00f781bdb679aafbc0f41ac180d (patch)
tree09d72933dc14f7d89c8119fc7d833cb5e1b4b995 /manifests/defaults
parent8e364f5929156827bc767d828b9c56b7144758fc (diff)
Fully qualify facter variables to suppress warnings
merge conflict due to immerda's branch not being up-to-date on the bot
Diffstat (limited to 'manifests/defaults')
-rw-r--r--manifests/defaults/commands.pp4
-rw-r--r--manifests/defaults/templates.pp4
-rw-r--r--manifests/defaults/vars.pp2
3 files changed, 5 insertions, 5 deletions
diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp
index 1213485..aefed8a 100644
--- a/manifests/defaults/commands.pp
+++ b/manifests/defaults/commands.pp
@@ -4,7 +4,7 @@ class nagios::defaults::commands {
include nagios::command::imap_pop3
# common service commands
- case $operatingsystem {
+ case $::operatingsystem {
debian,ubuntu: {
nagios_command {
check_dummy:
@@ -124,7 +124,7 @@ class nagios::defaults::commands {
# notification commands
- $mail_cmd_location = $operatingsystem ? {
+ $mail_cmd_location = $::operatingsystem ? {
centos => '/bin/mail',
default => '/usr/bin/mail'
}
diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp
index c97eee4..aec97c0 100644
--- a/manifests/defaults/templates.pp
+++ b/manifests/defaults/templates.pp
@@ -4,9 +4,9 @@ class nagios::defaults::templates {
file { 'nagios_templates':
path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_templates.cfg",
source => [ "puppet:///modules/site-nagios/configs/${fqdn}/nagios_templates.cfg",
- "puppet:///modules/site-nagios/configs/${operatingsystem}/nagios_templates.cfg",
+ "puppet:///modules/site-nagios/configs/${::operatingsystem}/nagios_templates.cfg",
"puppet:///modules/site-nagios/configs/nagios_templates.cfg",
- "puppet:///modules/nagios/configs/${operatingsystem}/nagios_templates.cfg",
+ "puppet:///modules/nagios/configs/${::operatingsystem}/nagios_templates.cfg",
"puppet:///modules/nagios/configs/nagios_templates.cfg" ],
notify => Service['nagios'],
mode => 0644, owner => root, group => root;
diff --git a/manifests/defaults/vars.pp b/manifests/defaults/vars.pp
index 6302f13..b0aef57 100644
--- a/manifests/defaults/vars.pp
+++ b/manifests/defaults/vars.pp
@@ -1,6 +1,6 @@
class nagios::defaults::vars {
case $nagios_cfgdir {
- '': { $int_nagios_cfgdir = $operatingsystem ? {
+ '': { $int_nagios_cfgdir = $::operatingsystem ? {
centos => '/etc/nagios/',
default => '/etc/nagios3'
}