[bug 1116489] Update Vagrant config files

This updates Vagrant config files. I claim that we don't need to support
the old vagrant configuration format anymore.

Further, Kitsune has enough stuff that it doesn't work with less than
1gb of memory, so we should start there and if someone wants to try
to change it, power to them.

I also switch to the trusty64 box that hashicorp manages because they
update it over time and therefore new contributors will have less to
update in their vm.
This commit is contained in:
Will Kahn-Greene 2015-09-25 14:09:24 -07:00
Родитель 0ad06d96c4
Коммит 62cb257cc9
3 изменённых файлов: 13 добавлений и 19 удалений

28
Vagrantfile поставляемый
Просмотреть файл

@ -18,25 +18,19 @@ end
CONF = _config
MOUNT_POINT = '/home/vagrant/kitsune'
Vagrant::Config.run do |config|
config.vm.box = "ubuntu-14.04"
config.vm.box_url = "https://oss-binaries.phusionpassenger.com/vagrant/boxes/latest/ubuntu-14.04-amd64-vbox.box"
Vagrant.configure(2) do |config|
config.vm.box = "ubuntu/trusty64"
Vagrant.configure("1") do |config|
config.vm.customize ["modifyvm", :id, "--memory", CONF['memory']]
config.vm.network "forwarded_port", guest:8000, host:8000
config.vm.network "private_network", ip: "33.33.33.77"
config.vm.synced_folder ".", "/vagrant", disabled: true
config.vm.synced_folder ".", MOUNT_POINT
config.vm.provider "virtualbox" do |vb|
vb.memory = CONF['memory']
end
Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v|
v.name = "KITSUNE_VM"
v.customize ["modifyvm", :id, "--memory", CONF['memory']]
end
end
config.vm.network :hostonly, "33.33.33.77"
config.vm.forward_port 8000, 8000
config.vm.share_folder("vagrant-root", MOUNT_POINT, ".")
config.vm.provision "shell", path: "bin/vagrant_provision.sh"
end

Просмотреть файл

@ -3,7 +3,7 @@
# Don't change this; use vagrantconfig_local.yaml to override these
# settings instead.
memory: 256
memory: 1024
# enable this to see verbose and debug puppet output
debug_mode: false

Просмотреть файл

@ -2,7 +2,7 @@
# Don't change this; copy this to vagrantconfig_local.yaml, and change that instead.
#memory: 256
#memory: 1024
# set this to "gui" if vagrant cannot connect
#boot_mode: gui