diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-22 16:22:49 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-22 16:22:49 -0200 |
| commit | 9c4dacfb6e0d437bbad422332c836481c067efd2 (patch) | |
| tree | 30765e6e854336d7f1199a3a32714c99b0e980f1 | |
| parent | 59040148cccdb53f71ae99b36a2442c5970d45ac (diff) | |
| download | puppet-nodo-9c4dacfb6e0d437bbad422332c836481c067efd2.tar.gz puppet-nodo-9c4dacfb6e0d437bbad422332c836481c067efd2.tar.bz2 | |
Changing hiera parameters
| -rw-r--r-- | manifests/host.pp | 2 | ||||
| -rw-r--r-- | manifests/nodo.pp | 10 | ||||
| -rw-r--r-- | manifests/personal.pp | 2 | ||||
| -rw-r--r-- | manifests/subsystems/monitor.pp | 4 | ||||
| -rw-r--r-- | manifests/vserver.pp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/manifests/host.pp b/manifests/host.pp index 0d27d7a..2762e91 100644 --- a/manifests/host.pp +++ b/manifests/host.pp @@ -21,7 +21,7 @@ class nodo::host inherits nodo { if !defined('monitor') { class { 'monitor': type => 'host', - use_nagios => hiera('host_use_nagios', True), + use_nagios => hiera('nodo::host::use_nagios', True), } } diff --git a/manifests/nodo.pp b/manifests/nodo.pp index e35ec3f..873c075 100644 --- a/manifests/nodo.pp +++ b/manifests/nodo.pp @@ -27,11 +27,11 @@ class nodo { $ntp_servers = [ 'a.ntp.br', 'b.ntp.br', 'c.ntp.br' ] # Email delivery configuration - case hiera('mail_delivery', 'exim') { + case hiera('nodo::mail_delivery', 'exim') { 'tunnel': { - $mail_hostname = hiera('mail_hostname') + $mail_hostname = hiera('nodo::mail_hostname') tunnel::mail { "$mail_hostname": - sshport => hiera('mail_ssh_port'), + sshport => hiera('nodo::mail_ssh_port'), } } 'postfix': { } @@ -47,8 +47,8 @@ class nodo { } class { 'apt': - include_src => hiera('apt_include_src', false), - use_next_release => hiera('apt_use_next_release', false), + include_src => hiera('nodo::apt_include_src', false), + use_next_release => hiera('nodo::apt_use_next_release', false), } include apt::unattended_upgrades diff --git a/manifests/personal.pp b/manifests/personal.pp index 849db63..9b7272a 100644 --- a/manifests/personal.pp +++ b/manifests/personal.pp @@ -12,7 +12,7 @@ class nodo::personal { # Monitoring class { 'monitor': type => 'personal', - use_nagios => hiera('personal_use_nagios', false), + use_nagios => hiera('nodo::personal::use_nagios', false), } # Misc user data diff --git a/manifests/subsystems/monitor.pp b/manifests/subsystems/monitor.pp index ee648ef..17848a0 100644 --- a/manifests/subsystems/monitor.pp +++ b/manifests/subsystems/monitor.pp @@ -1,7 +1,7 @@ class monitor( $type = 'vserver', - $use_nagios = true, - $use_fqdn = hiera('use_nagios_fqdn', false) + $use_nagios = hiera('nodo::monitor::use_nagios, True), + $use_fqdn = hiera('nodo::monitor::use_nagios_fqdn', false) ) { if $use_nagios != false { diff --git a/manifests/vserver.pp b/manifests/vserver.pp index 198c755..0e61750 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -48,7 +48,7 @@ class nodo::vserver inherits nodo { # Nagios configuration class { 'monitor': type => 'vserver', - use_nagios => hiera('vserver_use_nagios', false), + use_nagios => hiera('nodo::vserver::use_nagios', false), } } } |