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 14:22:56 -0800
commit929f3d0a057443151832151a3065c557f1c1580e (patch)
tree780ed8d2c4277163ea7f1593d9846a5dbd2a098d
parentac34449bf03ca474bbef95b56c9dacd8d35a0960 (diff)
downloadchef-provisioning-12-stable.tar.gz
Bring in cheffish and provisioning resources if they are installedchef-provisioning-12-stable
-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