Vagrantfile.erb in kitchen-vagrant-0.15.0

- old
+ new
@@ -18,23 +18,19 @@
 <% Array(config[:network]).each do |opts| %>
   c.vm.network(:<%= opts[0] %>, <%= opts[1..-1].join(", ") %>)
 <% end %>
 
   c.vm.synced_folder ".", "/vagrant", disabled: true
-<% config[:synced_folders].each do |source, destination, options|
-     l_source = source.gsub("%{instance_name}", instance.name)
-     l_destination = destination.gsub("%{instance_name}", instance.name)
-     opt = (options.nil? ? '' : ", #{options}")
-%>
-  c.vm.synced_folder "<%= l_source %>", "<%= l_destination %>"<%= opt %>
+<% config[:synced_folders].each do |source, destination, options| %>
+  c.vm.synced_folder "<%= source %>", "<%= destination %>", <%= options %>
 <% end %>
 
   c.vm.provider :<%= config[:provider] %> do |p|
 <% config[:customize].each do |key, value| %>
   <% case config[:provider]
      when "virtualbox" %>
     p.customize ["modifyvm", :id, "--<%= key %>", "<%= value %>"]
-  <% when "rackspace" %>
+  <% when "rackspace", "softlayer" %>
     p.<%= key %> = "<%= value%>"
   <% when /^vmware_/ %>
     <% if key == :memory %>
       <% unless config[:customize].include?(:memsize) %>
     p.vmx["memsize"] = "<%= value %>"