VPP-198: LISP map-resolver failover algorithm

[vpp.git] / build-root / vagrant / Vagrantfile

diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile
index 9bb53b9..641397e 100644 (file)
--- 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
@@ -44,7 +45,7 @@ Vagrant.configure(2) do |config|
   end
 
   # Define some physical ports for your VMs to be used by DPDK
-  nics = (ENV['VPP_VAGRANT_NICS'] || 2).to_i(10)
+  nics = (ENV['VPP_VAGRANT_NICS'] || "2").to_i(10)
   for i in 1..nics
     config.vm.network "private_network", type: "dhcp"
   end
@@ -57,13 +58,17 @@ Vagrant.configure(2) do |config|
   end
 
   vmcpu=(ENV['VPP_VAGRANT_VMCPU'] || 2)
-  vmram=(ENV['VPP_VAGRANT_VMRAM'] || 2048)
+  vmram=(ENV['VPP_VAGRANT_VMRAM'] || 4096)
   
   config.vm.synced_folder "../../", "/vpp", disabled: false
   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}"