Try to use getfromhash instead of extractnodeinfo

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index f00880c2f7b6e25237ee972202dea1053600cc1a..1e23846d07566b449d9823c82d4fe3410037f5ea 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -139,7 +139,7 @@ class debian-proliant inherits debian-org {
         "hp-health": ensure => installed;
         "arrayprobe": ensure => installed;
     }
-    case extractnodeinfo($nodeinfo, 'squeeze') {
+    case getfromhash($nodeinfo, 'squeeze') {
         true: {}
         default: {
             package {

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 5bf93feebfca44845cb170bf3d2f135e3b260d2b..a448d2aebfe90093951bf02bab38f696276f861c 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -162,7 +162,7 @@ class exim {
         refreshonly => true,
     }
 
-    case extractnodeinfo($nodeinfo, 'mail_port') {
+    case getfromhash($nodeinfo, 'mail_port') {
       /^(\d+)$/: { $mail_port = $1 }
       default: { $mail_port = 'smtp' }
     }

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 7ade513118c52703e4fb79896b7cc11950710437..71964c4295a5cff1c0591ecea51f0233443e6801 100644 (file)
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -70,7 +70,7 @@ class ferm {
         $munin_ips: script => "ip_";
     }
 
-    case extractnodeinfo($nodeinfo, 'buildd') {
+    case getfromhash($nodeinfo, 'buildd') {
         true: {
             file {
                 "/etc/ferm/conf.d/load_ftp_conntrack.conf":

diff --git a/modules/ntp/manifests/init.pp b/modules/ntp/manifests/init.pp
index 71c86330ebec2a14683d89ce427a9dff1355354c..4f42f3179335e1c1d2d457d5b6670a37a420afee 100644 (file)
--- a/modules/ntp/manifests/init.pp
+++ b/modules/ntp/manifests/init.pp
@@ -28,7 +28,7 @@ class ntp {
             ensure  => directory,
             ;
     }
-    case extractnodeinfo($nodeinfo, 'timeserver') {
+    case getfromhash($nodeinfo, 'timeserver') {
         true: { }
         default: {
             file {