generator_files/Vagrantfile.erb in berkshelf-3.0.0.beta3 vs generator_files/Vagrantfile.erb in berkshelf-3.0.0.beta4
- old
+ new
@@ -1,8 +1,14 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
+# Uncomment these lines (and the ones in the generated Gemfile) if you want
+# to live on the Edge:
+#
+# Vagrant.require_plugin "vagrant-berkshelf"
+# Vagrant.require_plugin "vagrant-omnibus"
+
Vagrant.configure("2") 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.
@@ -70,12 +76,9 @@
# vb.customize ["modifyvm", :id, "--memory", "1024"]
# end
#
# View the documentation for the provider you're using for more
# information on available options.
-
- config.ssh.max_tries = 40
- 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