summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <jkeiser@opscode.com>2014-11-05 14:22:56 -0800
committerJohn Keiser <jkeiser@opscode.com>2014-11-05 15:31:22 -0800
commitbf6340a113dd0c37e2084c70007d201742f11e9d (patch)
treecf75e9856b05c086b46d6f390796b664f5dc435d
parente32e9de33e6e78549c651c300c952cc1a37ed111 (diff)
downloadchef-bf6340a113dd0c37e2084c70007d201742f11e9d.tar.gz
Bring in cheffish and provisioning resources if they are installedchef-provisioning
-rw-r--r--lib/chef/resources.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/chef/resources.rb b/lib/chef/resources.rb
index 5b938095c6..696dbbdc55 100644
--- a/lib/chef/resources.rb
+++ b/lib/chef/resources.rb
@@ -78,3 +78,10 @@ require 'chef/resource/windows_package'
require 'chef/resource/yum_package'
require 'chef/resource/lwrp_base'
require 'chef/resource/bff_package'
+
+begin
+ # Optional resources chef_node, chef_client, machine, machine_image, etc.
+ require 'cheffish'
+ require 'chef/provisioning'
+rescue LoadError
+end