fix issues on nodes without lvm

tested manually on nodes with and without lvm

Author: rtib

lib/facter/lvm_support.rb

@@ -17,47 +17,48 @@
 Facter.add('lvm_vgs') do
   confine lvm_support: true
 
-  vgs = Facter::Core::Execution.execute('vgs -o name --noheadings 2>/dev/null', timeout: 30)
-
-  if vgs.nil?
-    setcode { 0 }
-  else
-    vg_list = vgs.split
-    setcode { vg_list.length }
+  if Facter.value(:lvm_support)
+    vgs = Facter::Core::Execution.execute('vgs -o name --noheadings 2>/dev/null', timeout: 30)
+    vg_list = vgs.split unless vgs.nil?
   end
+
+  setcode { vg_list.length }
 end
 
-# lvm_vg_[0-9]+
-#   VG name by index
+# # lvm_vg_[0-9]+
+# #   VG name by index
 vg_list.each_with_index do |vg, i|
-  Facter.add("lvm_vg_#{i}") { setcode { vg } }
+  Facter.add("lvm_vg_#{i}") do
+    setcode { vg }
+  end
   Facter.add("lvm_vg_#{vg}_pvs") do
     setcode do
-      pvs = Facter::Core::Execution.execute("vgs -o pv_name #{vg} 2>/dev/null", timeout: 30)
       res = nil
+      pvs = Facter::Core::Execution.execute("vgs -o pv_name #{vg} 2>/dev/null", timeout: 30)
       res = pvs.split("\n").grep(%r{^\s+/}).map(&:strip).sort.join(',') unless pvs.nil?
       res
     end
   end
 end
 
-# lvm_pvs: [0-9]+
-#   Number of PVs
+# # lvm_pvs: [0-9]+
+# #   Number of PVs
 pv_list = []
 Facter.add('lvm_pvs') do
   confine lvm_support: true
 
-  pvs = Facter::Core::Execution.execute('pvs -o name --noheadings 2>/dev/null', timeout: 30)
-  if pvs.nil?
-    setcode { 0 }
-  else
-    pv_list = pvs.split
-    setcode { pv_list.length }
+  if Facter.value(:lvm_support)
+    pvs = Facter::Core::Execution.execute('pvs -o name --noheadings 2>/dev/null', timeout: 30)
+    pv_list = pvs.split unless pvs.nil?
   end
+
+  setcode { pv_list.length }
 end
 
-# lvm_pv_[0-9]+
-#   PV name by index
+# # lvm_pv_[0-9]+
+# #   PV name by index
 pv_list.each_with_index do |pv, i|
-  Facter.add("lvm_pv_#{i}") { setcode { pv } }
+  Facter.add("lvm_pv_#{i}") do
+    setcode { pv }
+  end
 end