Change facts used by module

lib/facter/crashkernel.rb

@@ -0,0 +1,25 @@
+# Fact: crashkernel
+#
+# Purpose:
+#   This fact checks for current crashkernel in kernel boot
+#
+# Resolution:
+#   Checks `proc/cmdline`
+#
+# Caveats:
+#   Only supports Linux.
+#
+
+Facter.add(:crashkernel) do
+  confine kernel: :linux
+  setcode do
+    crashkernel = false
+    kernel_arguments = Facter.value(:kdump_kernel_arguments)
+    if kernel_arguments
+      if kernel_arguments =~ %r{crashkernel=(\S+)}
+        crashkernel = Regexp.last_match(1)
+      end
+    end
+    crashkernel
+  end
+end

lib/facter/kernel_arguments.rb → lib/facter/kdump_kernel_arguments.rb

@@ -1,4 +1,4 @@
-# Fact: kernel_arguments
+# Fact: kdump_kernel_arguments
 #
 # Purpose:
 #   This fact provides the arguments used for the currently running kernel
@@ -10,7 +10,7 @@
 #   Only supports Linux.
 #
 
-Facter.add(:kernel_arguments) do
+Facter.add(:kdump_kernel_arguments) do
   confine kernel: :linux
   setcode do
     cmdline_out = Facter::Core::Execution.execute('cat /proc/cmdline 2>/dev/null')

manifests/init.pp

@@ -132,7 +132,7 @@
       notify  => Service['kdump'],
     }
 
-    if $::kernel_arguments !~ /crashkernel/ {
+    if ! $facts['crashkernel'] {
       notify { 'kdump':
         message => 'A reboot is required to fully enable the crashkernel'
       }
@@ -151,7 +151,7 @@
       }
     }
 
-    if $::kernel_arguments =~ /crashkernel/ {
+    if $facts['crashkernel'] {
       notify { 'kdump':
         message => 'A reboot is required to fully disable the crashkernel'
       }

spec/classes/kdump_spec.rb

@@ -4,7 +4,7 @@
   on_supported_os.each do |os, facts|
     context "on #{os}" do
       let(:facts) do
-        facts.merge(kernel_arguments: my_fixture_read('kernelargs-with-crash.txt'))
+        facts.merge(crashkernel: 'auto')
       end
 
       let(:kernel_parameter_provider) do
@@ -62,7 +62,7 @@
 
       context 'when kernel_arguments does not contain crashkernel' do
         let(:facts) do
-          facts.merge(kernel_arguments: my_fixture_read('kernelargs-without-crash.txt'))
+          facts.merge(crashkernel: false)
         end
 
         it do
@@ -109,7 +109,7 @@
 
         context 'when kernel_arguments does not contain crashkernel' do
           let(:facts) do
-            facts.merge(kernel_arguments: my_fixture_read('kernelargs-without-crash.txt'))
+            facts.merge(crashkernel: false)
           end
 
           it do

spec/fixtures/unit/facter/crashkernel/kernelargs-without-crash.txt

@@ -0,0 +1 @@
+ro root=/dev/mapper/vg_sys-lv_root rd_LVM_LV=vg_sys/lv_swap rd_NO_LUKS LANG=en_US.UTF-8 rd_NO_MD  KEYTABLE=us nofb quiet splash=quiet SYSFONT=latarcyrheb-sun16 rd_LVM_LV=vg_sys/lv_root rd_NO_DM rhgb quiet

spec/fixtures/unit/facter/kdump_kernel_arguments/cmdline1

@@ -0,0 +1 @@
+ro root=/dev/mapper/vg_sys-lv_root rd_LVM_LV=vg_sys/lv_swap rd_NO_LUKS LANG=en_US.UTF-8 rd_NO_MD  KEYTABLE=us nofb quiet splash=quiet SYSFONT=latarcyrheb-sun16 rd_LVM_LV=vg_sys/lv_root rd_NO_DM rhgb quiet crashkernel=131M@0M

spec/unit/facter/crashkernel_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'crashkernel fact' do
+  before :each do
+    Facter.clear
+  end
+
+  context 'kernel is linux' do
+    it 'returns crashkernel' do
+      allow(Facter::Core::Execution).to receive(:exec).with('uname -s').and_return('Linux')
+      allow(Facter).to receive(:value).with(:kdump_kernel_arguments).and_return(my_fixture_read('kernelargs-with-crash.txt'))
+      expect(Facter.fact(:crashkernel).value).to eq('131M@0M')
+    end
+    it 'returns false' do
+      allow(Facter::Core::Execution).to receive(:exec).with('uname -s').and_return('Linux')
+      allow(Facter).to receive(:value).with(:kdump_kernel_arguments).and_return(my_fixture_read('kernelargs-without-crash.txt'))
+      expect(Facter.fact(:crashkernel).value).to eq(false)
+    end
+  end
+end

spec/unit/facter/kernel_arguments_spec.rb → spec/unit/facter/kdump_kernel_arguments_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'kernel_arguments fact' do
+describe 'kdump_kernel_arguments fact' do
   before :each do
     Facter.clear
   end
@@ -10,7 +10,7 @@
       expected_value = my_fixture_read('cmdline1')
       allow(Facter::Core::Execution).to receive(:exec).with('uname -s').and_return('Linux')
       allow(Facter::Core::Execution).to receive(:execute).with('cat /proc/cmdline 2>/dev/null').and_return(expected_value)
-      expect(Facter.fact(:kernel_arguments).value).to eq(expected_value)
+      expect(Facter.fact(:kdump_kernel_arguments).value).to eq(expected_value)
     end
   end
 end