host = args[0]
yamlfile = args[1]
begin
-
- require '/var/lib/puppet/lib/puppet/parser/functions/ldapinfo.rb'
- require '/var/lib/puppet/lib/puppet/parser/functions/whohosts.rb'
-
nodeinfo = function_yamlinfo([host, yamlfile])
nodeinfo['ldap'] = function_ldapinfo([host, '*'])
unless nodeinfo['ldap']['ipHostNumber']
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"])
+ nodeinfo['hoster'] = function_whohosts([nodeinfo['ldap']['ipHostNumber']])
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'))
unless nodeinfo['heavy_exim']
nodeinfo['smarthost'] = 'mailout.debian.org'
end
+ elsif lookupvar('::mta') == 'postfix'
+ unless nodeinfo['heavy_postfix']
+ nodeinfo['smarthost'] = 'mailout.debian.org'
+ end
end
nodeinfo['misc'] = {}
end
end
- ns = function_hiera(['nameservers'])
- allow_dns_q = function_hiera(['allow_dns_query'])
+ ns = call_function('hiera',['nameservers'])
+ allow_dns_q = call_function('hiera',['allow_dns_query'])
if ns.empty?
# no nameservers known for this hoster
nodeinfo['misc']['resolver-recursive'] = true