projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove respighi
[mirror/dsa-puppet.git]
/
modules
/
debian-org
/
lib
/
facter
/
cluster.rb
diff --git
a/modules/debian-org/lib/facter/cluster.rb
b/modules/debian-org/lib/facter/cluster.rb
index
dfff436
..
543eeba
100644
(file)
--- a/
modules/debian-org/lib/facter/cluster.rb
+++ b/
modules/debian-org/lib/facter/cluster.rb
@@
-1,16
+1,21
@@
if FileTest.exist?('/usr/sbin/gnt-cluster') and FileTest.exist?('/var/lib/ganeti/config.data')
begin
if system('/usr/sbin/gnt-cluster getmaster >/dev/null')
if FileTest.exist?('/usr/sbin/gnt-cluster') and FileTest.exist?('/var/lib/ganeti/config.data')
begin
if system('/usr/sbin/gnt-cluster getmaster >/dev/null')
- require '
json
'
-
json = JSON.parse(File.read('/var/lib/ganeti/config.data')
)
+ require '
yaml
'
+
yaml = YAML.load_file('/var/lib/ganeti/config.data'
)
Facter.add('cluster') do
setcode do
Facter.add('cluster') do
setcode do
- json['cluster']['cluster_name']
- end
+ yaml['cluster']['cluster_name']
end
Facter.add('cluster_nodes') do
end
Facter.add('cluster_nodes') do
- setcode do
- json['nodes'].keys.join(' ')
+ nodename = []
+ yaml["nodes"].each do |uuid,value|
+ nodename << value["name"]
+ end
+ ret = nodename.join(" ")
+ setcode do
+ ret
+ end
end
end
end
end
end
end