summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/chef/application/solo.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index 5e54535014..6140b9e589 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -185,11 +185,6 @@ class Chef::Application::Solo < Chef::Application
Chef::Config[:interval] ||= 1800
end
- if Chef::Config[:json_attribs]
- config_fetcher = Chef::ConfigFetcher.new(Chef::Config[:json_attribs])
- @chef_client_json = config_fetcher.fetch_json
- end
-
if Chef::Config[:recipe_url]
cookbooks_path = Array(Chef::Config[:cookbook_path]).detect{|e| e =~ /\/cookbooks\/*$/ }
recipes_path = File.expand_path(File.join(cookbooks_path, '..'))
@@ -204,6 +199,11 @@ class Chef::Application::Solo < Chef::Application
end
Chef::Mixin::Command.run_command(:command => "tar zxvf #{path} -C #{recipes_path}")
end
+
+ if Chef::Config[:json_attribs]
+ config_fetcher = Chef::ConfigFetcher.new(Chef::Config[:json_attribs])
+ @chef_client_json = config_fetcher.fetch_json
+ end
end
def setup_application