Don't system exit on ohai CriticalPluginFailure (#8098)

Signed-off-by: Joshua Miller <joshmiller@fb.com>

2 files changed, 1 insertions, 4 deletions

diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 15922a5efd..3347536c12 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -607,9 +607,6 @@ class Chef
       filter = Chef::Config[:minimal_ohai] ? %w{fqdn machinename hostname platform platform_version ohai_time os os_version init_package} : nil
       ohai.all_plugins(filter)
       events.ohai_completed(node)
-    rescue Ohai::Exceptions::CriticalPluginFailure => e
-      logger.error("Critical Ohai plugins failed: #{e.message}")
-      exit(false)
     end
 
     #
diff --git a/spec/unit/client_spec.rb b/spec/unit/client_spec.rb
index 9e20058846..1d9dd54290 100644
--- a/spec/unit/client_spec.rb
+++ b/spec/unit/client_spec.rb
@@ -51,7 +51,7 @@ describe Chef::Client do
         class CriticalPluginFailure < Error; end
       end
       expect(ohai_system).to receive(:all_plugins) { raise Ohai::Exceptions::CriticalPluginFailure }
-      expect { client.run_ohai }.to raise_error(SystemExit)
+      expect { client.run_ohai }.to raise_error(Ohai::Exceptions::CriticalPluginFailure)
     end
   end