diff --git a/manifests/gmetad/config.pp b/manifests/gmetad/config.pp index ebc6400..19ba632 100644 --- a/manifests/gmetad/config.pp +++ b/manifests/gmetad/config.pp @@ -11,14 +11,14 @@ # Copyright (C) 2012-2013 Joshua Hoblitt # -class ganglia::gmetad::config inherits ganglia::gmetad { +class ganglia::gmetad::config { - file { $gmetad_service_config: + file { $::ganglia::params::gmetad_service_config: ensure => present, owner => 'root', group => 'root', mode => '0644', - content => template($gmetad_service_erb), + content => template($::ganglia::params::gmetad_service_erb), notify => Class['ganglia::gmetad::service'], } } diff --git a/manifests/gmetad/install.pp b/manifests/gmetad/install.pp index b3790f7..efe0cad 100644 --- a/manifests/gmetad/install.pp +++ b/manifests/gmetad/install.pp @@ -11,9 +11,9 @@ # Copyright (C) 2012-2013 Joshua Hoblitt # -class ganglia::gmetad::install inherits ganglia::gmetad { +class ganglia::gmetad::install { - package { $gmetad_package_name: + package { $::ganglia::params::gmetad_package_name: ensure => present, } } diff --git a/manifests/gmetad/service.pp b/manifests/gmetad/service.pp index 7b18115..19293bd 100644 --- a/manifests/gmetad/service.pp +++ b/manifests/gmetad/service.pp @@ -11,19 +11,19 @@ # Copyright (C) 2012-2013 Joshua Hoblitt # -class ganglia::gmetad::service inherits ganglia::gmetad { +class ganglia::gmetad::service { - if ($gmetad_status_command) { + if ($::ganglia::params::gmetad_status_command) { $hasstatus = false } else { $hasstatus = true } - service { $gmetad_service_name: + service { $::ganglia::params::gmetad_service_name: ensure => running, hasstatus => $hasstatus, hasrestart => true, enable => true, - status => $gmetad_status_command, + status => $::ganglia::params::gmetad_status_command, } } diff --git a/manifests/gmond/config.pp b/manifests/gmond/config.pp index bc84248..2c7aa74 100644 --- a/manifests/gmond/config.pp +++ b/manifests/gmond/config.pp @@ -11,14 +11,14 @@ # Copyright (C) 2012-2013 Joshua Hoblitt # -class ganglia::gmond::config inherits ganglia::gmond { +class ganglia::gmond::config { - file { $gmond_service_config: + file { $::ganglia::params::gmond_service_config: ensure => present, owner => 'root', group => 'root', mode => '0644', - content => template($gmond_service_erb), + content => template($::ganglia::params::gmond_service_erb), notify => Class['ganglia::gmond::service'], } } diff --git a/manifests/gmond/install.pp b/manifests/gmond/install.pp index 79eca4a..d234e6b 100644 --- a/manifests/gmond/install.pp +++ b/manifests/gmond/install.pp @@ -11,9 +11,9 @@ # Copyright (C) 2012-2013 Joshua Hoblitt # -class ganglia::gmond::install inherits ganglia::gmond { +class ganglia::gmond::install { - package { $gmond_package_name: + package { $::ganglia::params::gmond_package_name: ensure => present, } } diff --git a/manifests/gmond/service.pp b/manifests/gmond/service.pp index 5f7dcdc..341c701 100644 --- a/manifests/gmond/service.pp +++ b/manifests/gmond/service.pp @@ -10,19 +10,19 @@ # Copyright (C) 2012-2013 Joshua Hoblitt # -class ganglia::gmond::service inherits ganglia::gmond{ +class ganglia::gmond::service { - if ($gmond_status_command) { + if ($::ganglia::params::gmond_status_command) { $hasstatus = false } else { $hasstatus = true } - service { $gmond_service_name: + service { $::ganglia::params::gmond_service_name: ensure => running, hasstatus => $hasstatus, hasrestart => true, enable => true, - status => $gmond_status_command, + status => $::ganglia::params::gmond_status_command, } } diff --git a/manifests/web/config.pp b/manifests/web/config.pp index dcc00cc..7cae8d2 100644 --- a/manifests/web/config.pp +++ b/manifests/web/config.pp @@ -11,13 +11,13 @@ # Copyright (C) 2012-2013 Joshua Hoblitt # -class ganglia::web::config inherits ganglia::web { +class ganglia::web::config { - file { $web_php_config: + file { $::ganglia::params::web_php_config: ensure => present, owner => 'root', group => 'root', mode => '0644', - content => template($web_php_erb), + content => template($::ganglia::params::web_php_erb), } } diff --git a/manifests/web/install.pp b/manifests/web/install.pp index 9ade5ff..723dd09 100644 --- a/manifests/web/install.pp +++ b/manifests/web/install.pp @@ -11,9 +11,9 @@ # Copyright (C) 2012-2013 Joshua Hoblitt # -class ganglia::web::install inherits ganglia::web { +class ganglia::web::install { - package { $web_package_name: + package { $::ganglia::params::web_package_name: ensure => present, } }