projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix munin 1
[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
ed2a0c0
..
4359285
100644
(file)
--- a/
modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
+++ b/
modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
@@
-5,9
+5,6
@@
module Puppet::Parser::Functions
ipAddrs = args[0]
yamlfile = args[1]
ipAddrs = args[0]
yamlfile = args[1]
- parser.watch_file(yamlfile)
-
- $KCODE = 'utf-8'
ans = {"name" => "unknown"}
yaml = YAML.load_file(yamlfile)
ans = {"name" => "unknown"}
yaml = YAML.load_file(yamlfile)
@@
-29,6
+26,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