projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
handle array of certfiles
[mirror/dsa-puppet.git]
/
modules
/
puppetmaster
/
lib
/
puppet
/
parser
/
functions
/
whohosts.rb
diff --git
a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
index
f98bf0a
..
ca0d295
100644
(file)
--- a/
modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
+++ b/
modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
@@
-5,9
+5,8
@@
module Puppet::Parser::Functions
ipAddrs = args[0]
yamlfile = args[1]
ipAddrs = args[0]
yamlfile = args[1]
- #self.interp.newfile(yamlfile)
-
- $KCODE = 'utf-8'
+ parser = Puppet::Parser::Parser.new(environment)
+ parser.watch_file(yamlfile)
ans = {"name" => "unknown"}
yaml = YAML.load_file(yamlfile)
ans = {"name" => "unknown"}
yaml = YAML.load_file(yamlfile)
@@
-29,6
+28,9
@@
module Puppet::Parser::Functions
end
end
end
end
end
end
+ if not ans['longname']
+ ans['longname'] = ans['name']
+ end
return ans
end
end
return ans
end
end