Changing hiera parameters

diff --git a/manifests/host.pp b/manifests/host.pp
index 0d27d7a257b9c10a72fd01fdb65ca08b9a85c69c..2762e9129ec46d61c3832c7d5df0980169cd495e 100644 (file)
--- 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 e35ec3fdc2cc84e554933f99400a79602cb31045..873c07576110e3f93b278d466fad217425b86bb1 100644 (file)
--- 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 849db6340ec279024ff33875007bcde387a28f3c..9b7272a5ba1ee03552105700b00bf4a5248782d7 100644 (file)
--- 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 ee648ef21f9c8d73d245070a1327ba1a96680d6a..17848a0aaedff705fb9f35425acddffd4ab647fe 100644 (file)
--- 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 198c75557ab036e1c4fd464fa42cff8cafd7d69c..0e617507456ddcbd4ff35f3cf01ded85368d506b 100644 (file)
--- 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),
       }
     }
   }