From 01582bb9d2032004c93659ae761fae87559657d1 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sun, 27 May 2012 20:01:55 +0100 Subject: [PATCH] ah, exception loading json Signed-off-by: Stephen Gran --- modules/debian-org/lib/facter/cluster.rb | 31 +++++++++++++----------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/modules/debian-org/lib/facter/cluster.rb b/modules/debian-org/lib/facter/cluster.rb index d7ef867d0..dfff43680 100644 --- a/modules/debian-org/lib/facter/cluster.rb +++ b/modules/debian-org/lib/facter/cluster.rb @@ -1,16 +1,19 @@ if FileTest.exist?('/usr/sbin/gnt-cluster') and FileTest.exist?('/var/lib/ganeti/config.data') - if system('/usr/sbin/gnt-cluster getmaster >/dev/null') - require 'json' - json = JSON.parse(File.read('/var/lib/ganeti/config.data')) - Facter.add('cluster') do - setcode do - json['cluster']['cluster_name'] - end - end - Facter.add('cluster_nodes') do - setcode do - json['nodes'].keys.join(' ') - end - end - end + begin + if system('/usr/sbin/gnt-cluster getmaster >/dev/null') + require 'json' + json = JSON.parse(File.read('/var/lib/ganeti/config.data')) + Facter.add('cluster') do + setcode do + json['cluster']['cluster_name'] + end + end + Facter.add('cluster_nodes') do + setcode do + json['nodes'].keys.join(' ') + end + end + end + rescue Exception => e + end end -- 2.20.1