tvd-vagrant 0.0.15 → 0.0.16

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/cookbooks/vagrant/templates/default/Vagrantfile.aws.erb

@@ -2,12 +2,22 @@ require "vagrant-aws"
 
 Vagrant.configure("2") do |config|
   config.vm.box = "<%= node[:vagrant][:box] %>"
-  <% if node[:vagrant][:provision] && node[:vagrant][:provision][:shell] %>
-  config.vm.provision :shell, :path => "<%= node[:vagrant][:provision][:shell][:path] %>"
-  <% end %>
 
+  <% if node[:vagrant][:ssh_username] %>
   config.ssh.username = "<%= node[:vagrant][:ssh_username] %>"
+  <% end %>
+
+  <% if node[:vagrant][:ssh_private_key_path] %>
   config.ssh.private_key_path = "<%= node[:vagrant][:ssh_private_key_path] %>"
+  <% end %>
+
+  <% if node[:vagrant][:provision] && node[:vagrant][:provision][:shell] %>
+  config.vm.provision :shell, 
+                      :path => "<%= node[:vagrant][:provision][:shell][:path] %>", 
+                      :args => "<%= node[:vagrant][:provision][:shell][:args] %>"
+  <% end %>
+
+  config.vm.synced_folder ".", "/vagrant", :id => "vagrant-root", :disabled => true
 
   config.vm.provider :aws do |aws|
     aws.keypair_name = "<%= node[:vagrant][:keypair_name] %>"

data/cookbooks/vagrant/templates/default/Vagrantfile.docker.erb

@@ -2,16 +2,26 @@ require "vagrant-shell"
 
 Vagrant.configure("2") do |config|
   config.vm.box = "<%= node[:vagrant][:box] %>"
+
+  <% if node[:vagrant][:ssh_username] %>
+  config.ssh.username = "<%= node[:vagrant][:ssh_username] %>"
+  <% end %>
+
+  <% if node[:vagrant][:ssh_private_key_path] %>
+  config.ssh.private_key_path = "<%= node[:vagrant][:ssh_private_key_path] %>"
+  <% end %>
+
   <% if node[:vagrant][:provision] && node[:vagrant][:provision][:shell] %>
-  config.vm.provision :shell, :path => "<%= node[:vagrant][:provision][:shell][:path] %>"
+  config.vm.provision :shell, 
+                      :path => "<%= node[:vagrant][:provision][:shell][:path] %>", 
+                      :args => "<%= node[:vagrant][:provision][:shell][:args] %>"
   <% end %>
 
-  config.ssh.username = "<%= node[:vagrant][:ssh_username] %>"
   config.vm.synced_folder ".", "/vagrant", :id => "vagrant-root", :disabled => true
 
   config.vm.provider :shell do |shell|
-    shell.script = ENV['SHELL_SCRIPT']
-    shell.run_args = [ ENV['SHELL_ARGS'] ]
+    shell.script = "<%= node[:vagrant][:shell_script] %>"
+    shell.run_args = "<%= node[:vagrant][:shell_args] %>"
   end
 end
 

data/cookbooks/vagrant/templates/default/Vagrantfile.virtualbox.erb

@@ -1,11 +1,25 @@
 Vagrant.configure("2") do |config|
   config.vm.box = "<%= node[:vagrant][:box] %>"
-  config.vm.base_mac = "<%= node[:vagrant][:base_mac] %>"
+
+  <% if node[:vagrant][:ssh_username] %>
+  config.ssh.username = "<%= node[:vagrant][:ssh_username] %>"
+  <% end %>
+
+  <% if node[:vagrant][:ssh_private_key_path] %>
+  config.ssh.private_key_path = "<%= node[:vagrant][:ssh_private_key_path] %>"
+  <% end %>
+
   <% if node[:vagrant][:provision] && node[:vagrant][:provision][:shell] %>
   config.vm.provision :shell, 
                       :path => "<%= node[:vagrant][:provision][:shell][:path] %>", 
                       :args => "<%= node[:vagrant][:provision][:shell][:args] %>"
   <% end %>
+
+  config.vm.synced_folder ".", "/vagrant", :id => "vagrant-root", :disabled => true
+
+  config.vm.provider :virtualbox do |virtualbox, override|
+    override.vm.base_mac = "<%= node[:vagrant][:base_mac] %>"
+  end
 end
 
 # vi: set ft=ruby :

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tvd-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors: