Directory variables should be nil if invalid.

4 files changed, 6 insertions, 2 deletions

diff --git a/lib/facter/gluster_bricks.rb b/lib/facter/gluster_bricks.rb
index b8852bc..2039144 100644
--- a/lib/facter/gluster_bricks.rb
+++ b/lib/facter/gluster_bricks.rb
@@ -35,7 +35,7 @@ end
 
 if var.nil?
 	# if we can't get a valid vardirtmp, then we can't continue
-	uuidfile = nil
+	valid_brickdir = nil
 else
 	module_vardir = var+'gluster/'
 	valid_brickdir = module_vardir.gsub(/\/$/, '')+'/brick/'
diff --git a/lib/facter/gluster_fsm.rb b/lib/facter/gluster_fsm.rb
index 887e869..fae84cc 100644
--- a/lib/facter/gluster_fsm.rb
+++ b/lib/facter/gluster_fsm.rb
@@ -48,7 +48,7 @@ end
 
 if var.nil?
 	# if we can't get a valid vardirtmp, then we can't collect...
-	valid_dir = nil
+	fsm_dir = nil
 else
 	module_vardir = var+'gluster/'
 	valid_dir = module_vardir.gsub(/\/$/, '')+'/'
diff --git a/lib/facter/gluster_uuid.rb b/lib/facter/gluster_uuid.rb
index 78f137d..ed0bf70 100644
--- a/lib/facter/gluster_uuid.rb
+++ b/lib/facter/gluster_uuid.rb
@@ -39,6 +39,8 @@ end
 
 if var.nil?
 	# if we can't get a valid vardirtmp, then we can't continue
+	module_vardir = nil
+	uuiddir = nil
 	uuidfile = nil
 else
 	module_vardir = var+'gluster/'
diff --git a/lib/facter/gluster_vrrp.rb b/lib/facter/gluster_vrrp.rb
index 1c35758..79676e6 100644
--- a/lib/facter/gluster_vrrp.rb
+++ b/lib/facter/gluster_vrrp.rb
@@ -42,6 +42,8 @@ end
 
 if var.nil?
 	# if we can't get a valid vardirtmp, then we can't continue
+	module_vardir = nil
+	vrrpdir = nil
 	vrrpfile = nil
 	ipfile = nil
 else