Vagrantfile only needs one machine now
This commit is contained in:
parent
f7022711c0
commit
77712c14ee
|
@ -23,7 +23,7 @@ EOF
|
||||||
sudo mv /tmp/gopath.sh /etc/profile.d/gopath.sh
|
sudo mv /tmp/gopath.sh /etc/profile.d/gopath.sh
|
||||||
sudo chmod 0755 /etc/profile.d/gopath.sh
|
sudo chmod 0755 /etc/profile.d/gopath.sh
|
||||||
|
|
||||||
# Make sure the gopath is usable by bamboo
|
# Make sure the gopath is usable by vagrant
|
||||||
sudo chown -R vagrant:vagrant $SRCROOT
|
sudo chown -R vagrant:vagrant $SRCROOT
|
||||||
sudo chown -R vagrant:vagrant /opt/gopath
|
sudo chown -R vagrant:vagrant /opt/gopath
|
||||||
|
|
||||||
|
@ -32,6 +32,8 @@ sudo apt-get install -y git-core
|
||||||
SCRIPT
|
SCRIPT
|
||||||
|
|
||||||
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||||
|
config.vm.box = "chef/ubuntu-10.04"
|
||||||
|
|
||||||
config.vm.provision "shell", inline: $script
|
config.vm.provision "shell", inline: $script
|
||||||
|
|
||||||
["vmware_fusion", "vmware_workstation"].each do |p|
|
["vmware_fusion", "vmware_workstation"].each do |p|
|
||||||
|
@ -41,11 +43,4 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||||
v.vmx["cpuid.coresPerSocket"] = "1"
|
v.vmx["cpuid.coresPerSocket"] = "1"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
config.vm.define "64bit" do |n1|
|
|
||||||
n1.vm.box = "chef/ubuntu-10.04"
|
|
||||||
end
|
|
||||||
config.vm.define "32bit" do |n2|
|
|
||||||
n2.vm.box = "chef/ubuntu-10.04-i386"
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue