diff options
author | James Shubin <james@shubin.ca> | 2014-03-07 19:04:37 -0500 |
---|---|---|
committer | James Shubin <james@shubin.ca> | 2014-03-16 22:39:07 -0400 |
commit | 2dd6acd1eeffbfdcf0436847ee115310198526f4 (patch) | |
tree | 7f43dfdfe78084c88dc7f48aea133765a35c99e9 | |
parent | 2804934ecba7dfd52a222765174ad1c3018bab5f (diff) | |
download | puppet-gluster-2dd6acd1eeffbfdcf0436847ee115310198526f4.tar.gz puppet-gluster-2dd6acd1eeffbfdcf0436847ee115310198526f4.tar.xz puppet-gluster-2dd6acd1eeffbfdcf0436847ee115310198526f4.zip |
Directory variables should be nil if invalid.
-rw-r--r-- | lib/facter/gluster_bricks.rb | 2 | ||||
-rw-r--r-- | lib/facter/gluster_fsm.rb | 2 | ||||
-rw-r--r-- | lib/facter/gluster_uuid.rb | 2 | ||||
-rw-r--r-- | lib/facter/gluster_vrrp.rb | 2 |
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 |