Skip to content

Commit

Permalink
* Correctly detect provider
Browse files Browse the repository at this point in the history
  • Loading branch information
eddyxu committed Oct 2, 2013
1 parent 2f4446c commit 44cbf76
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
18 changes: 12 additions & 6 deletions devbox/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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|
Expand Down
2 changes: 1 addition & 1 deletion puppet/vsfs
Submodule vsfs updated from 91582d to f6522d

0 comments on commit 44cbf76

Please sign in to comment.