use deep merge for machine() add_machine_options, addresses

bootstrap_options merge failure in chef-boneyard#455
keen99 · Sep 30, 2015 · 0a99013 · 0a99013
1 parent d8cbf5d
commit 0a99013
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/chef/resource/machine.rb b/lib/chef/resource/machine.rb
@@ -98,10 +98,9 @@ def file(remote_path, local = nil)
   end
 
   def add_machine_options(options)
-    @machine_options = Cheffish::MergedConfig.new(options, @machine_options)
+    @machine_options = Chef::Mixin::DeepMerge.hash_only_merge(options, @machine_options)
   end
 
-
   # This is here because provisioning users will probably want to do things like:
   # machine "foo"
   #   action :destroy