projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore missing swede
[mirror/dsa-puppet.git]
/
modules
/
puppetmaster
/
lib
/
puppet
/
parser
/
functions
/
entropy_provider.rb
diff --git
a/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
b/modules/puppetmaster/lib/puppet/parser/functions/entropy_provider.rb
index
85b8bf1
..
fe7606b
100644
(file)
--- 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
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]
require 'digest/sha1'
fqdn = args[0]
@@
-22,7
+21,7
@@
module Puppet::Parser::Functions
next unless localinfo[node]['entropy_key']
addresses = allnodeinfo[node]['ipHostNumber']
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
name = thishoster['name']
provider << node
@@
-30,6
+29,7
@@
module Puppet::Parser::Functions
hoster[name] = [] unless hoster[name]
hoster[name] << node
end
hoster[name] = [] unless hoster[name]
hoster[name] << node
end
+ raise Puppet::ParseError, "entropy_provider: no entropy providers" unless provider.size > 0
# figure out which entropy provider to use
consumer_hoster = nodeinfo['hoster']
# figure out which entropy provider to use
consumer_hoster = nodeinfo['hoster']