module Puppet::Parser::Functions
newfunction(:nodeinfo, :type => :rvalue) do |args|
+ host = args[0]
+ yamlfile = args[1]
begin
- host = args[0]
- yamlfile = args[1]
require '/var/lib/puppet/lib/puppet/parser/functions/ldapinfo.rb'
require '/var/lib/puppet/lib/puppet/parser/functions/whohosts.rb'
raise Puppet::ParseError, "Host #{host} does not have ipHostNumber values in ldap"
end
nodeinfo['hoster'] = function_whohosts(nodeinfo['ldap']['ipHostNumber'], "/etc/puppet/modules/debian-org/misc/hoster.yaml")
+ raise Puppet::ParseError, "#{nodeinfo['ldap']['purpose']}"
+ nodeinfo['buildd'] = nodeinfo['ldap']['purpose'].include?('buildd')
nodeinfo['misc'] = {}
- fqdn = lookupvar('fqdn')
+ fqdn = lookupvar('::fqdn')
if fqdn and fqdn == host
- v4ips = lookupvar('v4ips')
+ v4ips = lookupvar('::v4ips')
if v4ips
nodeinfo['misc']['v4addrs'] = v4ips.split(',')
nodeinfo['misc']['natted'] = intersection.empty?
end
- v6ips = lookupvar('v6ips')
- if v6ips and v6ips != "no"
+ v6ips = lookupvar('::v6ips')
+ if v6ips and v6ips != ""
nodeinfo['misc']['v6addrs'] = v6ips.split(',')
end
end
if nodeinfo['hoster']['allow_dns_query']
raise Puppet::ParseError, "No nameservers listed for #{nodeinfo['hoster']['name']} yet we should answer somebody's queries? That makes no sense."
end
- elsif (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v4addrs']).size > 0 or
- (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v6addrs']).size > 0
+ elsif (nodeinfo['misc']['v4addrs'] and (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v4addrs']).size > 0) or
+ (nodeinfo['misc']['v6addrs'] and (nodeinfo['hoster']['nameservers'] & nodeinfo['misc']['v6addrs']).size > 0)
# this host is listed as a nameserver at this location
nodeinfo['misc']['resolver-recursive'] = true
return(nodeinfo)
rescue => e
- raise Puppet::ParseError, "Error while trying to match addr #{addr} for net #{net}: #{e.message}\n#{e.backtrace}"
+ raise Puppet::ParseError, "Error in nodeinfo for node #{host}, yamlfile #{yamlfile}: #{e.message}\n#{e.backtrace}"
end
end
end