Ensure that solo specific code is run at the proper time

ie, only when we're in OG mode and not in local mode.

Signed-off-by: Thom May <thom@chef.io>

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/chef/client.rb b/lib/chef/client.rb
index 48d7c447cc..054b284bd5 100644
--- a/lib/chef/client.rb
+++ b/lib/chef/client.rb
@@ -262,7 +262,7 @@ class Chef
         enforce_path_sanity
         run_ohai
 
-        register unless Chef::Config[:solo]
+        register unless Chef::Config[:solo_legacy_mode]
 
         load_node
 
@@ -533,7 +533,7 @@ class Chef
     # @api private
     #
     def save_updated_node
-      if Chef::Config[:solo]
+      if Chef::Config[:solo_legacy_mode]
         # nothing to do
       elsif policy_builder.temporary_policy?
         Chef::Log.warn("Skipping final node save because override_runlist was given")
@@ -936,7 +936,7 @@ class Chef
     end
 
     def assert_cookbook_path_not_empty(run_context)
-      if Chef::Config[:solo]
+      if Chef::Config[:solo_legacy_mode]
         # Check for cookbooks in the path given
         # Chef::Config[:cookbook_path] can be a string or an array
         # if it's an array, go through it and check each one, raise error at the last one if no files are found