projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add security.anycast-test server alias, do away with having both testing-anycast...
[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
fea1435
..
46d0bec
100644
(file)
--- a/
modules/debian-org/lib/facter/cluster.rb
+++ b/
modules/debian-org/lib/facter/cluster.rb
@@
-1,16
+1,14
@@
-if FileTest.exist?('/usr/sbin/gnt-cluster') and FileTest.exist?('/var/lib/ganeti/
config.data
')
+if FileTest.exist?('/usr/sbin/gnt-cluster') and FileTest.exist?('/var/lib/ganeti/
ssconf_cluster_name
')
begin
if system('/usr/sbin/gnt-cluster getmaster >/dev/null')
begin
if system('/usr/sbin/gnt-cluster getmaster >/dev/null')
- require 'yaml'
- yaml = YAML.load_file('/var/lib/ganeti/config.data')
Facter.add('cluster') do
setcode do
Facter.add('cluster') do
setcode do
- yaml['cluster']['cluster_name']
+ open('/var/lib/ganeti/ssconf_cluster_name').read().chomp()
end
end
-
end
-
Facter.add('cluster_nodes') do
+ end
+ Facter.add('cluster_nodes') do
setcode do
setcode do
-
yaml['nodes'].keys.join(' '
)
+
open('/var/lib/ganeti/ssconf_node_list').read().split().join(" "
)
end
end
end
end
end
end