Add a method to get all the yaml stored (local) info for all hosts

[dsa-puppet.git] / files / etc / puppet / lib / puppet / parser / functions / nodeinfo.rb

diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
index 159b869e9ab0148e090e3861b9a45cdfc3f18d6e..fae9d6dd7d11d5f497b745f6f24e29d28359437e 100644 (file)
--- a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
+++ b/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb
@@ -3,62 +3,14 @@ module Puppet::Parser::Functions
 
     host = args[0]
     yamlfile = args[1]
-    parser.watch_file(yamlfile)
 
-    require 'ldap'
-    require 'yaml'
+    require '/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb'
+    require '/etc/puppet/lib/puppet/parser/functions/yamlinfo.rb'
 
-    $KCODE = 'utf-8'
-
-    yaml = YAML.load_file(yamlfile)
-    results = {}
-
-    ['nameinfo', 'footer'].each do |detail|
-      if yaml.has_key?(detail)
-        if yaml[detail].has_key?(host)
-          results[detail] = yaml[detail][host]
-        end
-      end
-    end
-
-    if yaml.has_key?('services')
-      ['bugsmaster', 'qamaster', 'mailrelay', 'rtmaster', 'packagesmaster'].each do |service|
-        if yaml['services'].has_key?(service)
-          results[service] = host == yaml['services'][service]
-        end
-      end
-    end
-
-    results['mail_port'] = ''
-    results['smarthost']      = ''
-    results['smarthost_port'] = 587
-    results['reservedaddrs'] = '0.0.0.0/8 : 127.0.0.0/8 : 10.0.0.0/8 : 169.254.0.0/16 : 172.16.0.0/12 : 192.0.0.0/17 : 192.168.0.0/16 : 224.0.0.0/4 : 240.0.0.0/5 : 248.0.0.0/5'
-
-    if yaml.has_key?('mail_port') and yaml['mail_port'].has_key?(host)
-      results['mail_port'] = yaml['mail_port'][host]
-    end
-
-    if yaml.has_key?('need_smarthost') and yaml['need_smarthost'].include?(host)
-      results['smarthost']      = "mailout.debian.org"
-    end
-
-    if yaml.has_key?('reservedaddrs') and yaml['reservedaddrs'].has_key?(host)
-      results['reservedaddrs'] = yaml['reservedaddrs'][host]
-    end
-
-    ldap = LDAP::Conn.new('db.debian.org')
-
-    results['ldap'] = []
-    filter = '(hostname=' + host +')'
-    begin
-      ldap.search2('ou=hosts,dc=debian,dc=org', LDAP::LDAP_SCOPE_SUBTREE, filter) do |x|
-        results['ldap'] << x
-      end
-    rescue LDAP::ResultError
-    rescue RuntimeError
-    ensure
-      ldap.unbind
-    end
+    results         = function_yamlinfo(host, yamlfile)
+    results['ldap'] = function_ldapinfo(host, '*')
     return(results)
   end
 end
+
+# vim: set fdm=marker ts=2 sw=2 et: