From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 1 Mar 2011 11:06:22 +0000 (+0100)
Subject: Try to use getfromhash instead of extractnodeinfo
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=06944747f9c1a5b6abb35cf7f5e82207ad3b0023;p=dsa-puppet.git

Try to use getfromhash instead of extractnodeinfo
---

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index f00880c2..1e23846d 100644
--- 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 5bf93fee..a448d2ae 100644
--- 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 7ade5131..71964c42 100644
--- 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 71c86330..4f42f317 100644
--- 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 {