generator_files/Vagrantfile.erb in berkshelf-1.4.0.rc1 vs generator_files/Vagrantfile.erb in berkshelf-1.4.0

- old
+ new

@@ -66,10 +66,14 @@ config.ssh.timeout = 120 # The path to the Berksfile to use with Vagrant Berkshelf # config.berkshelf.berksfile_path = "./Berksfile" + # Enabling the Berkshelf plugin. To enable this globally, add this configuration + # option to your ~/.vagrant.d/Vagrantfile file + config.berkshelf.enabled = true + # An array of symbols representing groups of cookbook described in the Vagrantfile # to exclusively install and copy to Vagrant's shelf. # config.berkshelf.only = [] # An array of symbols representing groups of cookbook described in the Vagrantfile @@ -81,10 +85,13 @@ chef.chef_server_url = "<%= options[:berkshelf_config].chef.chef_server_url %>" chef.validation_client_name = "<%= options[:berkshelf_config].chef.validation_client_name %>" chef.validation_key_path = "<%= options[:berkshelf_config].chef.validation_key_path %>" chef.run_list = [ + <% if options[:chef_minitest] -%> + "recipe[minitest-handler::default]", + <% end -%> "recipe[<%= cookbook_name %>::default]" ] end <% elsif options[:berkshelf_config].vagrant.vm.provision == "chef_solo" -%> config.vm.provision :chef_solo do |chef| @@ -95,9 +102,12 @@ :server_repl_password => 'replpass' } } chef.run_list = [ + <% if options[:chef_minitest] -%> + "recipe[minitest-handler::default]", + <% end -%> "recipe[<%= cookbook_name %>::default]" ] end <% end -%> end