Pick up knife config instead of /etc/chef/client.rb if local mode is specified

1 files changed, 7 insertions, 6 deletions

diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb
index 86dac79603..5ff6b92643 100644
--- a/lib/chef/knife.rb
+++ b/lib/chef/knife.rb
@@ -314,7 +314,7 @@ class Chef
       config_file_settings
     end
 
-    def locate_config_file
+    def self.locate_config_file
       candidate_configs = []
 
       # Look for $KNIFE_HOME/knife.rb (allow multiple knives config on same machine)
@@ -326,8 +326,8 @@ class Chef
         candidate_configs << File.join(Dir.pwd, 'knife.rb')
       end
       # Look for $UPWARD/.chef/knife.rb
-      if self.class.chef_config_dir
-        candidate_configs << File.join(self.class.chef_config_dir, 'knife.rb')
+      if chef_config_dir
+        candidate_configs << File.join(chef_config_dir, 'knife.rb')
       end
       # Look for $HOME/.chef/knife.rb
       if ENV['HOME']
@@ -337,10 +337,10 @@ class Chef
       candidate_configs.each do | candidate_config |
         candidate_config = File.expand_path(candidate_config)
         if File.exist?(candidate_config)
-          config[:config_file] = candidate_config
-          break
+          return candidate_config
         end
       end
+      return nil
     end
 
     # Apply Config in this order:
@@ -404,7 +404,8 @@ class Chef
 
     def configure_chef
       unless config[:config_file]
-        locate_config_file
+        located_config_file = self.class.locate_config_file
+        config[:config_file] = located_config_file if located_config_file
       end
 
       # Don't try to load a knife.rb if it doesn't exist.