From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 23 Apr 2012 08:12:09 +0000 (-0700)
Subject: Update vagrant configs for vagrant 1.0
X-Git-Tag: v2.3.0~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ae39bc6d171e7ca2abe8d3ddfc6304397664978;p=thirdparty%2Ftornado.git

Update vagrant configs for vagrant 1.0
---

diff --git a/maint/vm/freebsd/Vagrantfile b/maint/vm/freebsd/Vagrantfile
index 1672492a5..b86bd807a 100644
--- a/maint/vm/freebsd/Vagrantfile
+++ b/maint/vm/freebsd/Vagrantfile
@@ -1,5 +1,3 @@
-require 'vagrant/systems/freebsd'
-
 Vagrant::Config.run do |config|
     # A freebsd image can be created with veewee
     # https://github.com/jedi4ever/veewee
@@ -10,18 +8,16 @@ Vagrant::Config.run do |config|
     # vagrant box add freebsd freebsd.box
     config.vm.box = "freebsd"
 
-    config.vm.system = :freebsd
+    config.vm.guest = :freebsd
     
     # Note that virtualbox shared folders don't work with freebsd, so
     # we'd need nfs shared folders here even if virtualbox gains
     # support for symlinks.
-    config.vm.network "172.19.1.3"
-    config.vm.share_folder("tornado", "/tornado", "../../..", :nfs => true)
-
-    # This doesn't seem to get mounted by default for freebsd,
-    # but that's actually a good thing since there are apparently issues
+    config.vm.network :hostonly, "172.19.1.3"
+    # Name this v-root to clobber the default /vagrant mount point.
+    # We can't mount it over nfs because there are apparently issues
     # when one nfs export is a subfolder of another.
-    #config.vm.share_folder("v-root", "/vagrant", ".", :nfs => true)
+    config.vm.share_folder("v-root", "/tornado", "../../..", :nfs => true)
 
     config.vm.provision :shell, :path => "setup.sh"
 end
\ No newline at end of file
diff --git a/maint/vm/ubuntu10.04/Vagrantfile b/maint/vm/ubuntu10.04/Vagrantfile
index 63520cb3e..31f7b1850 100644
--- a/maint/vm/ubuntu10.04/Vagrantfile
+++ b/maint/vm/ubuntu10.04/Vagrantfile
@@ -2,7 +2,7 @@ Vagrant::Config.run do |config|
     config.vm.box = "lucid64"
     config.vm.box_url = "http://files.vagrantup.com/lucid64.box"
 
-    config.vm.network "172.19.1.2"
+    config.vm.network :hostonly, "172.19.1.2"
     config.vm.share_folder("tornado", "/tornado", "../../..", :nfs=> true)
 
     config.vm.provision :shell, :path => "setup.sh"
diff --git a/maint/vm/ubuntu11.04/Vagrantfile b/maint/vm/ubuntu11.04/Vagrantfile
index 00a193887..79b70ee5b 100644
--- a/maint/vm/ubuntu11.04/Vagrantfile
+++ b/maint/vm/ubuntu11.04/Vagrantfile
@@ -1,7 +1,7 @@
 Vagrant::Config.run do |config|
     config.vm.box = "ubuntu11.04"
 
-    config.vm.network "172.19.1.4"
+    config.vm.network :hostonly, "172.19.1.4"
     config.vm.share_folder("tornado", "/tornado", "../../..", :nfs=> true)
 
     config.vm.provision :shell, :path => "setup.sh"