summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2015-07-20 12:01:38 -0700
committerClaire McQuin <claire@getchef.com>2015-07-27 09:24:18 -0700
commit247a910aaf8b6d78df56780f800a05a5120f0e2b (patch)
treea68f3663d23955ab2064dc1aaf21c25909fb2a28
parent28e20d62f3dcb29f34c2f67b41a1b486108f388d (diff)
downloadchef-247a910aaf8b6d78df56780f800a05a5120f0e2b.tar.gz
Add ohai configuration context to config.
-rw-r--r--lib/chef/config.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/chef/config.rb b/lib/chef/config.rb
index 9beb18b53e..d3ed6b3a8f 100644
--- a/lib/chef/config.rb
+++ b/lib/chef/config.rb
@@ -28,9 +28,12 @@ require 'chef-config/logger'
ChefConfig.logger = Chef::Log
require 'chef-config/config'
-
require 'chef/platform/query_helpers'
+# Load the ohai config into the chef config. We can't have an empty ohai
+# configuration context because `ohai.plugins_path << some_path` won't work.
+require 'ohai/config'
+
class Chef
Config = ChefConfig::Config