Fixed issue with json output in vpp_api_test.

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

diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile
index 4e2669b..f402165 100644 (file)
--- a/build-root/vagrant/Vagrantfile
+++ b/build-root/vagrant/Vagrantfile
@@ -13,6 +13,22 @@ Vagrant.configure(2) do |config|
     config.vm.provision 'shell', path: 'bootstrap.ubuntu1404.sh'
   end
 
+  # 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
   # vagrant up
   # to enable, run
@@ -22,6 +38,15 @@ Vagrant.configure(2) do |config|
     config.cache.scope = :box
   end
 
+  # Define some physical ports for your VMs to be used by DPDK
+  nics = 0
+  if ENV.key?('VPP_VAGRANT_NICS')
+    nics = ENV['VPP_VAGRANT_NICS'].to_i(10)
+  end
+  for i in 1..nics
+    config.vm.network "private_network", type: "dhcp"
+  end
+
   # use http proxy if avaiable
   if ENV['http_proxy'] && Vagrant.has_plugin?("vagrant-proxyconf")
    config.proxy.http     = "$http_proxy"