openstack
/
designate
Code Issues Proposed changes

Merge "Vagrant: NFS should only be used for libvirt"

This commit is contained in:
Jenkins 2015-05-07 20:10:00 +00:00 committed by Gerrit Code Review
parent 8309afa3bf 0a90d47103
commit 888467fd5f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
contrib/vagrant/Vagrantfile vendored
View File

@ -9,25 +9,25 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.network "forwarded_port", guest: 5354, host: 5354, protocol: "tcp"
config.vm.network "forwarded_port", guest: 5354, host: 5354, protocol: "udp"
config.vm.provider "virtualbox" do |vb|
config.vm.provider "virtualbox" do |vb, override|
vb.customize ["modifyvm", :id, "--memory", "2048"]
if not RUBY_PLATFORM.downcase.include?("mswin")
vb.customize ["modifyvm", :id, "--cpus", `awk "/^processor/ {++n} END {print n}" /proc/cpuinfo 2> /dev/null || sh -c 'sysctl hw.logicalcpu 2> /dev/null || echo ": 2"' | awk \'{print \$2}\' `.chomp ]
end
vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"]
config.vm.synced_folder "../..", "/opt/stack/designate"
override.vm.synced_folder "../..", "/opt/stack/designate"
if File.directory?("../../../python-designateclient")
config.vm.synced_folder "../../../python-designateclient", "/opt/stack/python-designateclient"
override.vm.synced_folder "../../../python-designateclient", "/opt/stack/python-designateclient"
end
if File.directory?("../../../../openstack/rally")
config.vm.synced_folder "../../../../openstack/rally", "/opt/stack/rally"
override.vm.synced_folder "../../../../openstack/rally", "/opt/stack/rally"
end
end
config.vm.provider :libvirt do |lv|
config.vm.provider :libvirt do |lv, override|
lv.graphics_ip = '0.0.0.0'
lv.nested = true
lv.memory = 8192
@ -35,15 +35,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
lv.cpus = `awk "/^processor/ {++n} END {print n}" /proc/cpuinfo 2> /dev/null || sh -c 'sysctl hw.logicalcpu 2> /dev/null || echo ": 2"' | awk \'{print \$2}\' `.chomp
end
config.vm.synced_folder ".", "/vagrant", type: "nfs"
config.vm.synced_folder "../..", "/opt/stack/designate", type: "nfs"
override.vm.synced_folder ".", "/vagrant", type: "nfs"
override.vm.synced_folder "../..", "/opt/stack/designate", type: "nfs"
if File.directory?("../../../python-designateclient")
config.vm.synced_folder "../../../python-designateclient", "/opt/stack/python-designateclient", type: "nfs"
override.vm.synced_folder "../../../python-designateclient", "/opt/stack/python-designateclient", type: "nfs"
end
if File.directory?("../../../../openstack/rally")
config.vm.synced_folder "../../../../openstack/rally", "/opt/stack/rally", type: "nfs"
override.vm.synced_folder "../../../../openstack/rally", "/opt/stack/rally", type: "nfs"
end
end