X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpuppetmaster%2Flib%2Fpuppet%2Fparser%2Ffunctions%2Fentropy_provider.rb;h=fe7606b40aa8e921aafb23e0f472cb93ed08c4e1;hb=9c394a1e25602ff8a17048f2fd67ee19acf02cae;hp=9f628cb60a4af87c0b2f7b5679b9a3af4f6a5888;hpb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;p=mirror%2Fdsa-puppet.git diff --git a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb index 9f628cb60..fe7606b40 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb @@ -1,7 +1,6 @@ module Puppet::Parser::Functions newfunction(:entropy_provider, :type => :rvalue) do |args| begin - require '/var/lib/puppet/lib/puppet/parser/functions/whohosts.rb' require 'digest/sha1' fqdn = args[0] @@ -22,7 +21,7 @@ module Puppet::Parser::Functions next unless localinfo[node]['entropy_key'] addresses = allnodeinfo[node]['ipHostNumber'] - thishoster = function_whohosts([addresses, "/etc/puppet/modules/debian_org/misc/hoster.yaml"]) + thishoster = function_whohosts([addresses]) name = thishoster['name'] provider << node