Use ldap's purpose field (ganeti/kvm host) to decide which hosts get the puppet ganet...

[mirror/dsa-puppet.git] / modules / puppetmaster / lib / puppet / parser / functions / nodeinfo.rb

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index 872eeff..b0a91f1 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -14,6 +14,7 @@ module Puppet::Parser::Functions
       nodeinfo['buildd'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('buildd'))
       nodeinfo['timeserver'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('timeserver'))
       nodeinfo['porterbox'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('porterbox'))
+      nodeinfo['ganeti'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('ganeti/kvm host'))
 
       if lookupvar('::mta') == 'exim4'
         unless nodeinfo['heavy_exim']
@@ -30,7 +31,7 @@ module Puppet::Parser::Functions
       if fqdn and fqdn == host
         v4ips = lookupvar('::v4ips')
         if v4ips and v4ips.to_s != "" and v4ips.to_s != 'undefined'
-          nodeinfo['misc']['v4addrs'] = v4ips.split(',')
+          nodeinfo['misc']['v4addrs'] = v4ips.split(',').uniq()
 
           # find out if we are behind nat
           intersection = nodeinfo['misc']['v4addrs'] & nodeinfo['ldap']['ipHostNumber']
@@ -41,7 +42,7 @@ module Puppet::Parser::Functions
 
         v6ips = lookupvar('::v6ips')
         if v6ips and v6ips.to_s != "" and v6ips.to_s != 'undefined'
-          nodeinfo['misc']['v6addrs'] = v6ips.split(',')
+          nodeinfo['misc']['v6addrs'] = v6ips.split(',').uniq()
         else
           nodeinfo['misc']['v6addrs'] = []
         end