X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build-root%2Fvagrant%2FVagrantfile;h=7067bfc071a31d9797ba602382c9ebad8a00512d;hb=a38c3df5fd2bf1bf8b3389e882f6dcd5ac533202;hp=f00233d632ce6be90bf4d86239a2cb2c4463e0b8;hpb=46e88fe905adbd17a82d161042475b1b5a198370;p=vpp.git

diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile
index f00233d632c..7067bfc071a 100644
--- a/build-root/vagrant/Vagrantfile
+++ b/build-root/vagrant/Vagrantfile
@@ -6,11 +6,32 @@ Vagrant.configure(2) do |config|
   # Pick the right distro and bootstrap, default is ubuntu1404
   distro = ENV['VPP_VAGRANT_DISTRO']
   if distro == 'centos7'
-    config.vm.box = "puppetlabs/centos-7.0-64-nocm"
-    config.vm.provision 'shell', path: 'bootstrap.centos7.sh'
+    config.vm.box = "puppetlabs/centos-7.2-64-nocm"
   else
     config.vm.box = "puppetlabs/ubuntu-14.04-64-nocm"
-    config.vm.provision 'shell', path: 'bootstrap.ubuntu1404.sh'
+  end
+  config.vm.box_check_update = false
+
+  config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"update.sh")
+  config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"build.sh"), :args => "/vpp vagrant"
+  config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"install.sh"), :args => "/vpp"
+  config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"clearinterfaces.sh")
+  config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"run.sh")
+
+  # Add .gnupg dir in so folks can sign patches
+  # Note, as gnupg puts socket files in that dir, we have
+  # to be cautious and make sure we are dealing with a plain file
+  homedir = File.expand_path("~/")
+  Dir["#{homedir}/.gnupg/**/*"].each do |fname|
+    if File.file?(fname)
+      destname = fname.sub(Regexp.escape("#{homedir}/"),'')
+      config.vm.provision "file", source: fname, destination: destname
+    end
+  end
+
+  # Copy in the .gitconfig if it exists
+  if File.file?(File.expand_path("~/.gitconfig"))
+    config.vm.provision  "file", source: "~/.gitconfig", destination: ".gitconfig"
   end
 
   # vagrant-cachier caches apt/yum etc to speed subsequent
@@ -23,7 +44,7 @@ Vagrant.configure(2) do |config|
   end
 
   # Define some physical ports for your VMs to be used by DPDK
-  nics = 0
+  nics = 2
   if ENV.key?('VPP_VAGRANT_NICS')
     nics = ENV['VPP_VAGRANT_NICS'].to_i(10)
   end
@@ -33,18 +54,24 @@ Vagrant.configure(2) do |config|
 
   # use http proxy if avaiable
   if ENV['http_proxy'] && Vagrant.has_plugin?("vagrant-proxyconf")
-   config.proxy.http     = "$http_proxy"
-   config.proxy.https    = "$https_proxy"
+   config.proxy.http     = ENV['http_proxy']
+   config.proxy.https    = ENV['https_proxy']
    config.proxy.no_proxy = "localhost,127.0.0.1"
   end
 
   config.vm.synced_folder "../../", "/vpp", disabled: false
   config.vm.provider "virtualbox" do |vb|
-    vb.memory = "4096"
+      vb.customize ["modifyvm", :id, "--ioapic", "on"]
+      vb.memory = 4096
+      vb.cpus = 2
   end
   config.vm.provider "vmware_fusion" do |fusion,override|
     fusion.vmx["memsize"] = "4096"
   end
+  config.vm.provider "libvirt" do |lv|
+    lv.memory = 4096
+    lv.cpus = 8
+  end
   config.vm.provider "vmware_workstation" do |vws,override|
     vws.vmx["memsize"] = "8192"
     vws.vmx["numvcpus"] = "4"