diff options
Diffstat (limited to 'build-root/vagrant')
| -rw-r--r-- | build-root/vagrant/Vagrantfile | 9 | ||||
| -rw-r--r-- | build-root/vagrant/bootstrap.ubuntu1404.sh | 5 |
2 files changed, 13 insertions, 1 deletions
diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile index 4e2669b513a..f00233d632c 100644 --- a/build-root/vagrant/Vagrantfile +++ b/build-root/vagrant/Vagrantfile @@ -22,6 +22,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" diff --git a/build-root/vagrant/bootstrap.ubuntu1404.sh b/build-root/vagrant/bootstrap.ubuntu1404.sh index 89cd4e8eac4..18023010976 100644 --- a/build-root/vagrant/bootstrap.ubuntu1404.sh +++ b/build-root/vagrant/bootstrap.ubuntu1404.sh @@ -1,3 +1,6 @@ +# Fix grub-pc on Virtualbox with Ubuntu +export DEBIAN_FRONTEND=noninteractive + # Standard update + upgrade dance apt-get update apt-get upgrade -y @@ -7,7 +10,7 @@ apt-get upgrade -y sudo update-alternatives --install /bin/sh sh /bin/bash 100 # Install build tools -apt-get install -y build-essential autoconf automake bison libssl-dev ccache libtool git dkms debhelper +apt-get install -y build-essential autoconf automake bison libssl-dev ccache libtool git dkms debhelper emacs # Install other stuff # apt-get install -y qemu-kvm libvirt-bin ubuntu-vm-builder bridge-utils |