Skip to content

Commit

Permalink
Merge pull request #366 from mwrock/master
Browse files Browse the repository at this point in the history
expose machine_spec.from_image to allocate_machine
  • Loading branch information
tyler-ball committed Jul 21, 2015
2 parents 39a4016 + d95650e commit 6d848b0
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions lib/chef/provider/machine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ def machine_options(driver)
end
}

configs << { from_image: new_resource.from_image } if new_resource.from_image
configs << new_resource.machine_options if new_resource.machine_options
configs << driver.config[:machine_options] if driver.config[:machine_options]
Cheffish::MergedConfig.new(*configs)
Expand Down

0 comments on commit 6d848b0

Please sign in to comment.