X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-root%2Fvagrant%2FVagrantfile;h=1f8cf9ab7c267199d3990ed64838f6e3e53d4e0d;hb=0be5ec304d2d4cfc6faecbb519ef165d9ab5d34e;hp=fac37eaddb6e8b2c67f643edec63f9cabcfbd70c;hpb=f8035649e928c45b6315dade2d33767b94209661;p=vpp.git diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile index fac37eaddb6..1f8cf9ab7c2 100644 --- a/build-root/vagrant/Vagrantfile +++ b/build-root/vagrant/Vagrantfile @@ -7,6 +7,7 @@ Vagrant.configure(2) do |config| distro = ( ENV['VPP_VAGRANT_DISTRO'] || "ubuntu1404") if distro == 'centos7' config.vm.box = "puppetlabs/centos-7.2-64-nocm" + config.ssh.insert_key = false else config.vm.box = "puppetlabs/ubuntu-14.04-64-nocm" end @@ -58,12 +59,32 @@ Vagrant.configure(2) do |config| vmcpu=(ENV['VPP_VAGRANT_VMCPU'] || 2) vmram=(ENV['VPP_VAGRANT_VMRAM'] || 4096) - - config.vm.synced_folder "../../", "/vpp", disabled: false + + config.ssh.forward_agent = true + + config.vm.synced_folder "../../", "/vpp", type: "rsync", + rsync__auto: false, + rsync__exclude: [ + "build-root/build*/", + "build-root/install*/", + "build-root/images*/", + "build-root/*.deb", + "build-root/*.rpm", + "build-root/*.changes", + "build-root/python", + "build-root/deb/debian/*.dkms", + "build-root/deb/debian/*.install", + "build-root/deb/debian/changes", + "build-root/tools"] + config.vm.provider "virtualbox" do |vb| vb.customize ["modifyvm", :id, "--ioapic", "on"] vb.memory = "#{vmram}" vb.cpus = "#{vmcpu}" + + #support for the SSE4.x instruction is required in some versions of VB. + vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.1", "1"] + vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.2", "1"] end config.vm.provider "vmware_fusion" do |fusion,override| fusion.vmx["memsize"] = "#{vmram}"