X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fnodeinfo.rb;h=947caf70ab97c1b58202d68aec65c5946f183d0f;hb=69c19f570b0c7668d1374600a5a7cedaa81fbe2d;hp=ff447e89b1ac0cdb84df010c0790361fdc2e0a2c;hpb=5c6109f1d1fe490d5c725f2706644e88574f0b41;p=dsa-puppet.git diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb index ff447e89..947caf70 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb @@ -5,9 +5,14 @@ module Puppet::Parser::Functions yamlfile = args[1] require '/var/lib/puppet/lib/puppet/parser/functions/ldapinfo.rb' + require '/var/lib/puppet/lib/puppet/parser/functions/whohosts.rb' results = function_yamlinfo(host, yamlfile) results['ldap'] = function_ldapinfo(host, '*') + unless results['ldap']['ipHostNumber'] + raise Puppet::ParseError, "Host #{host} does not have ipHostNumber values in ldap" + end + results['hoster'] = whohosts(results['ldap']['ipHostNumber'], "/etc/puppet/modules/debian-org/misc/hoster.yaml") results['misc'] = {} fqdn = lookupvar('fqdn')