projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add pieta
[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
7a02be4
..
cf8ea9d
100644
(file)
--- a/
modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/
modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@
-7,13
+7,15
@@
module Puppet::Parser::Functions
require '/var/lib/puppet/lib/puppet/parser/functions/ldapinfo.rb'
require '/var/lib/puppet/lib/puppet/parser/functions/whohosts.rb'
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, '*'
)
+ 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
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'], "/etc/puppet/modules/debian-org/misc/hoster.yaml"]
)
nodeinfo['buildd'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('buildd'))
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'))
if lookupvar('::mta') == 'exim4'
unless nodeinfo['heavy_exim']
if lookupvar('::mta') == 'exim4'
unless nodeinfo['heavy_exim']
@@
-39,8
+41,8
@@
module Puppet::Parser::Functions
end
end
end
end
- ns = function_hiera(
'nameservers'
)
- allow_dns_q = function_hiera(
'allow_dns_query'
)
+ ns = function_hiera(
['nameservers']
)
+ allow_dns_q = function_hiera(
['allow_dns_query']
)
if ns.empty?
# no nameservers known for this hoster
nodeinfo['misc']['resolver-recursive'] = true
if ns.empty?
# no nameservers known for this hoster
nodeinfo['misc']['resolver-recursive'] = true