summaryrefslogtreecommitdiff
path: root/lib/chef/application/solo.rb
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2016-02-24 21:05:14 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2016-02-24 21:27:19 -0800
commitcbb0f567ba9fa669a43761c6e2452734fa9a3fd5 (patch)
tree5080b5f75d688aaabaf320ae84ad5f1123e00ac7 /lib/chef/application/solo.rb
parent8741f64af2120c9bde40e98464e9724130dd9b80 (diff)
downloadchef-cbb0f567ba9fa669a43761c6e2452734fa9a3fd5.tar.gz
Add support for solo.d
Diffstat (limited to 'lib/chef/application/solo.rb')
-rw-r--r--lib/chef/application/solo.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb
index 3917a080b9..a39546092e 100644
--- a/lib/chef/application/solo.rb
+++ b/lib/chef/application/solo.rb
@@ -27,9 +27,11 @@ require "chef/config_fetcher"
require "fileutils"
require "chef/mixin/shell_out"
require "pathname"
+require "chef-config/mixin/dot_d"
class Chef::Application::Solo < Chef::Application
include Chef::Mixin::ShellOut
+ include ChefConfig::Mixin::DotD
option :config_file,
:short => "-c CONFIG",
@@ -207,6 +209,8 @@ class Chef::Application::Solo < Chef::Application
def reconfigure
super
+ load_dot_d(Chef::Config[:solo_d_dir]) if Chef::Config[:solo_d_dir]
+
set_specific_recipes
Chef::Config[:solo] = true