Vagrantfile.erb in berkshelf-0.6.0.beta3

- old
+ new

@@ -25,42 +25,72 @@
 
   # An array of symbols representing groups of cookbook described in the Vagrantfile
   # to skip installing and copying to Vagrant's shelf.
   # config.berkshelf.except = []
 
-  config.vm.host_name = "<%= cookbook_name %>-berkshelf"
+<% if options[:berkshelf_config][:vagrant][:vm][:box].present? -%>
+  config.vm.host_name = "<%= options[:berkshelf_config][:vagrant][:vm][:host_name] %>"
+<% else -%>
+  config.vm.host_name = "<%= "#{cookbook_name}-berkshelf" %>"
+<% end -%>
 
+
   # CentOS 6.3
+<% if options[:berkshelf_config][:vagrant][:vm][:box].present? -%>
+  config.vm.box = "<%= options[:berkshelf_config][:vagrant][:vm][:box] %>"
+<% else %>
   config.vm.box = "Berkshelf-CentOS-6.3-x86_64-minimal"
+<% end -%>
+<% if options[:berkshelf_config][:vagrant][:vm][:box_url].present? -%>
+  config.vm.box_url = "<%= options[:berkshelf_config][:vagrant][:vm][:box_url] %>"
+<% else %>
   config.vm.box_url = "https://dl.dropbox.com/u/31081437/Berkshelf-CentOS-6.3-x86_64-minimal.box"
+<% end -%>
 
   # Boot with a GUI so you can see the screen. (Default is headless)
   # config.vm.boot_mode = :gui
 
   # Assign this VM to a host-only network IP, allowing you to access it
   # via the IP. Host-only networks can talk to the host machine as well as
   # any other machines on the same network, but cannot be accessed (through this
   # network interface) by any external networks.
-  config.vm.network :hostonly, "33.33.33.10"
+  # config.vm.network :hostonly, "33.33.33.10"
+<% if options[:berkshelf_config][:vagrant][:vm][:network][:hostonly].present? -%>
+  config.vm.network :hostonly, "<%= options[:berkshelf_config][:vagrant][:vm][:network][:hostonly] %>"
+<% end -%>
 
   # Assign this VM to a bridged network, allowing you to connect directly to a
   # network using the host's network device. This makes the VM appear as another
   # physical device on your network.
-  # config.vm.network :bridged
+  <% unless options[:berkshelf_config][:vagrant][:vm][:network][:bridged].present? %># <% end %>config.vm.network :bridged
 
   # Forward a port from the guest to the host, which allows for outside
   # computers to access the VM, whereas host only networking does not.
   # config.vm.forward_port 80, 8080
+<% options[:berkshelf_config][:vagrant][:vm][:forward_port].each do |guest, host| %>
+  config.vm.forward_port <%= guest %>, <%= host %>
+<% end if options[:berkshelf_config][:vagrant][:vm][:forward_port].present? %>
 
   # Share an additional folder to the guest VM. The first argument is
   # an identifier, the second is the path on the guest to mount the
   # folder, and the third is the path on the host to the actual folder.
   # config.vm.share_folder "v-data", "/vagrant_data", "../data"
 
   config.ssh.max_tries = 40
   config.ssh.timeout   = 120
 
+<% if options[:berkshelf_config][:vagrant][:vm][:provision] == "chef_client" -%>
+  config.vm.provision :chef_client do |chef|
+    chef.chef_server_url = "<%= options[:berkshelf_config][:vagrant][:chef][:chef_server_url] %>"
+    chef.validation_client_name = "<%= options[:berkshelf_config][:vagrant][:chef][:validation_client_name] %>"
+    chef.validation_key_path = "<%= options[:berkshelf_config][:vagrant][:chef][:validation_key_path] %>"
+
+    chef.run_list = [
+      "recipe[<%= cookbook_name %>::default]"
+    ]
+  end
+<% else -%>
   config.vm.provision :chef_solo do |chef|    
     chef.json = {
       :mysql => {
         :server_root_password => 'rootpass',
         :server_debian_password => 'debpass',
@@ -70,16 +100,7 @@
 
     chef.run_list = [
       "recipe[<%= cookbook_name %>::default]"
     ]
   end
-
-  # config.vm.provision :chef_client do |chef|
-  #   chef.chef_server_url = 'https://api.opscode.com/organizations/vialstudios'
-  #   chef.validation_client_name = 'vialstudios-validator'
-  #   chef.validation_key_path = '/Users/reset/.chef/vialstudios-validator.pem'
-  #
-  #   chef.run_list = [
-  #     "recipe[<%= cookbook_name %>::default]"
-  #   ]
-  # end
+<% end -%>
 end