summaryrefslogtreecommitdiff
path: root/lib/chef/knife.rb
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2013-10-09 16:30:38 -0700
committerJohn Keiser <jkeiser@opscode.com>2013-10-09 16:30:38 -0700
commitf9521c3aaa6aaa42f94bbf81b260797da199f6a9 (patch)
treef7f7a0edbed4956ff5717506a76355f5f42b9e25 /lib/chef/knife.rb
parent629a153ae98a5660cbf2370665d4fcbd57695a96 (diff)
downloadchef-f9521c3aaa6aaa42f94bbf81b260797da199f6a9.tar.gz
Make --local-mode option so that local user can run local recipes
Diffstat (limited to 'lib/chef/knife.rb')
-rw-r--r--lib/chef/knife.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/chef/knife.rb b/lib/chef/knife.rb
index 420e3557e8..86dac79603 100644
--- a/lib/chef/knife.rb
+++ b/lib/chef/knife.rb
@@ -379,7 +379,10 @@ class Chef
Chef::Config[:chef_server_url] = config[:chef_server_url] if config[:chef_server_url]
Chef::Config[:environment] = config[:environment] if config[:environment]
- Chef::Config.chef_zero.enabled = true if config[:chef_zero_enabled]
+ Chef::Config.local_mode = config[:local_mode] if config.has_key?(:local_mode)
+ if Chef::Config.local_mode && !Chef::Config.has_key?(:cookbook_path) && !Chef::Config.has_key?(:chef_repo_path)
+ Chef::Config.chef_repo_path = Chef::Config.find_chef_repo_path(Dir.pwd)
+ end
Chef::Config.chef_zero.port = config[:chef_zero_port] if config[:chef_zero_port]
# Expand a relative path from the config directory. Config from command