Switching to hiera

diff --git a/manifests/host.pp b/manifests/host.pp
index 219c783507eb4dfc5f04b73457371c1b48c8d8d9..082abe684c3ec9cbc2ed79890cbe683c15abdb14 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 => extlookup('host_use_nagios'),
+      use_nagios => hiera('host_use_nagios', true),
     }
   }
 

diff --git a/manifests/nodo.pp b/manifests/nodo.pp
index 3f29010fe368958cfc1861ec964abdf3420a45de..0ab38367013b6b809384f1239ca6020dfcab9cbb 100644 (file)
--- a/manifests/nodo.pp
+++ b/manifests/nodo.pp
@@ -46,8 +46,8 @@ class nodo {
     }
 
     class { 'apt':
-      include_src      => extlookup('apt_include_src'),
-      use_next_release => extlookup('apt_use_next_release'),
+      include_src      => hiera('apt_include_src', false),
+      use_next_release => hiera('apt_use_next_release', false),
     }
 
     include apt::unattended_upgrades

diff --git a/manifests/personal.pp b/manifests/personal.pp
index 79bd611b55ba59874692dee7c9c87ee54eab0d33..dfcacb0eb8648ca29239874c3f26ba8ac070bc8b 100644 (file)
--- a/manifests/personal.pp
+++ b/manifests/personal.pp
@@ -12,7 +12,7 @@ class nodo::personal {
   # Monitoring
   class { 'monitor':
     type       => 'personal',
-    use_nagios => extlookup('personal_use_nagios'),
+    use_nagios => hiera('personal_use_nagios', false),
   }
 
   # Currently tor management just works for debian

diff --git a/manifests/subsystems/firewall.pp b/manifests/subsystems/firewall.pp
index 130e63875c5661e6e157b56e930b40af4119b67f..6d31461f475242bf52267ad51d8ed44034564177 100644 (file)
--- a/manifests/subsystems/firewall.pp
+++ b/manifests/subsystems/firewall.pp
@@ -118,7 +118,7 @@ class firewall {
     destination     => '$FW',
     proto           => '-',
     destinationport => '-',
-    ratelimit       => extlookup("firewall_ssl_ratelimit", '-'),
+    ratelimit       => hiera("firewall_ssl_ratelimit", '-'),
     order           => 103,
   }
 

diff --git a/manifests/subsystems/monitor.pp b/manifests/subsystems/monitor.pp
index f4b5ccb866d75ffac9575bb444975520be1a5000..ee648ef21f9c8d73d245070a1327ba1a96680d6a 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 = extlookup('use_nagios_fqdn')
+  $use_fqdn = hiera('use_nagios_fqdn', false)
 ) {
 
   if $use_nagios != false {

diff --git a/manifests/vserver.pp b/manifests/vserver.pp
index f4558afaff89d1983b7de95ef4a2abbc76ea782c..198c75557ab036e1c4fd464fa42cff8cafd7d69c 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 => extlookup('vserver_use_nagios'),
+        use_nagios => hiera('vserver_use_nagios', false),
       }
     }
   }