(CAT-1302) - LVM module failure when LVM package is not installed

puppetlabs · Aug 9, 2023 · 56801bf · 56801bf
1 parent 22ba15e
commit 56801bf
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/lib/facter/lvm_support.rb b/lib/facter/lvm_support.rb
@@ -17,14 +17,15 @@
 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 }
-  end
+  setcode {
+    vgs = Facter::Core::Execution.execute('vgs -o name --noheadings 2>/dev/null', timeout: 30)
+    unless vgs.nil?
+      vg_list = vgs.split
+      vg_list.length
+    else
+      0
+    end
+  }
 end
 
 # lvm_vg_[0-9]+
@@ -47,13 +48,15 @@
 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 }
-  end
+  setcode {
+    pvs = Facter::Core::Execution.execute('pvs -o name --noheadings 2>/dev/null', timeout: 30)
+    unless pvs.nil?
+      pv_list = pvs.split
+      pv_list.length
+    else
+      0
+    end
+  }
 end
 
 # lvm_pv_[0-9]+