diff --git a/devbox/Vagrantfile b/devbox/Vagrantfile index a2e640a..65c4914 100644 --- a/devbox/Vagrantfile +++ b/devbox/Vagrantfile @@ -6,15 +6,21 @@ Vagrant.configure("2") do |config| # options are documented and commented below. For a complete reference, # please see the online documentation at vagrantup.com. + config.vm.provider "virtualbox" do |vbox, override| + override.vm.box = "saucy" + override.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/saucy/current/saucy-server-cloudimg-amd64-vagrant-disk1.box" + vbox.customize ["modifyvm", :id, "--memory", "2048"] + end + # Every Vagrant virtual environment requires a box to build off of. - config.vm.provider :kvm do |kvm| - config.vm.box = "raring" - config.vm.network :private_network, ip: "192.168.192.122" + config.vm.provider "kvm" do |kvm, override| + override.vm.box = "raring" + override.vm.network :private_network, ip: "192.168.192.122" end - config.vm.provider :lxc do |lxc| - config.vm.box = "lxc-raring" - config.vm.box_url = "http://dl.dropbox.com/u/13510779/lxc-raring-amd64-2013-04-21.box" + config.vm.provider "lxc" do |lxc, override| + override.vm.box = "lxc-raring" + override.vm.box_url = "http://dl.dropbox.com/u/13510779/lxc-raring-amd64-2013-04-21.box" end config.vm.provision :puppet do |puppet| diff --git a/puppet/vsfs b/puppet/vsfs index 91582d9..f6522d0 160000 --- a/puppet/vsfs +++ b/puppet/vsfs @@ -1 +1 @@ -Subproject commit 91582d9d01981908bd962ee9ffa0dc6c4ff8bfea +Subproject commit f6522d0048b521bf2f43e58702bb681c2ffa8368