templates/Vagrantfile.erb in kitchen-vagrant-1.3.3 vs templates/Vagrantfile.erb in kitchen-vagrant-1.3.4
- old
+ new
@@ -1,7 +1,7 @@
<% config[:vagrantfiles].each do |vagrantfile| %>
-require "<%= vagrantfile %>"
+load "<%= vagrantfile %>"
<% end %>
Vagrant.configure("2") do |c|
c.berkshelf.enabled = false if Vagrant.has_plugin?("vagrant-berkshelf")
<% if config[:cachier] %>
@@ -108,10 +108,10 @@
p.linked_clone = <%= config[:linked_clone] %>
<% end
when "hyperv" %>
p.vmname = "kitchen-<%= File.basename(config[:kitchen_root]) %>-<%= instance.name %>"
<% if config[:linked_clone] == true || config[:linked_clone] == false %>
- p.differencing_disk = <%= config[:linked_clone] %>
+ p.linked_clone = <%= config[:linked_clone] %>
<% end
end %>
<% config[:customize].each do |key, value| %>
<% case config[:provider]