generator_files/Vagrantfile.erb in berkshelf-0.4.0 vs generator_files/Vagrantfile.erb in berkshelf-0.5.0.rc1

@@ -1,10 +1,34 @@
+require 'berkshelf/vagrant'
+
 Vagrant::Config.run do |config|
   # All Vagrant configuration is done here. The most common configuration
   # options are documented and commented below. For a complete reference,
   # please see the online documentation at vagrantup.com.
 
+  # The path to the Berksfile to use with Vagrant Berkshelf
+  # config.berkshelf.berksfile_path = "./Berksfile"
+
+  # The path to the Knife config to use with Vagrant Berkshelf
+  # config.berkshelf.config_path = "~/.chef/knife.rb"
+
+  # A client name (node_name) to use with the Chef Client provisioner to upload
+  # cookbooks installed by Berkshelf.
+  # config.berkshelf.node_name = "reset"
+
+  # A path to a client key on disk to use with the Chef Client provisioner to
+  # upload cookbooks installed by Berkshelf.
+  # config.berkshelf.client_key = "~/.chef/reset.pem"
+
+  # An array of symbols representing groups of cookbook described in the Vagrantfile
+  # to skip installing and copying to Vagrant's shelf.
+  # config.berkshelf.only = []
+
+  # 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"
 
   # CentOS 6.3
   config.vm.box = "Berkshelf-CentOS-6.3-x86_64-minimal"
   config.vm.box_url = "https://dl.dropbox.com/u/31081437/Berkshelf-CentOS-6.3-x86_64-minimal.box"
@@ -33,12 +57,10 @@
   # config.vm.share_folder "v-data", "/vagrant_data", "../data"
 
   config.ssh.max_tries = 40
   config.ssh.timeout   = 120
 
-  config.vm.provision :chef_solo do |chef|
-    chef.cookbooks_path = ["cookbooks"]
-    
+  config.vm.provision :chef_solo do |chef|    
     chef.json = {
       :mysql => {
         :server_root_password => 'rootpass',
         :server_debian_password => 'debpass',
         :server_repl_password => 'replpass'