Add missing libraries to requirements

[csit.git] / resources / tools / vagrant / Vagrantfile

diff --git a/resources/tools/vagrant/Vagrantfile b/resources/tools/vagrant/Vagrantfile
index 3e18192..46e2146 100644 (file)
--- a/resources/tools/vagrant/Vagrantfile
+++ b/resources/tools/vagrant/Vagrantfile
@@ -20,6 +20,8 @@ $user_addition = <<-SHELL
     echo csit:csit | sudo chpasswd
     sudo adduser csit vagrant
     id csit
+    echo "csit ALL=(root) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/csit
+    sudo chmod 0440 /etc/sudoers.d/csit
 SHELL
 
 $install_prereqs = <<-SHELL
@@ -32,15 +34,16 @@ SHELL
 $install_vpp = <<-SHELL
     sudo apt-get -y purge vpp\*
     cd /vagrant
-    if [ -e /vagrant/vpp-*.deb ]; then
-        sudo dpkg -i vpp-*.deb
+    vpp_pkgs="$(echo vpp*.deb)"
+    if [ "$vpp_pkgs" != "vpp*.deb" ]; then
+        sudo dpkg -i vpp*.deb
     fi
 SHELL
 
 
 def add_dut(config, name, mgmt_ip, net1, net2)
   config.vm.define name do |node|
-    node.vm.box = "puppetlabs/ubuntu-14.04-64-nocm"
+    node.vm.box = "fdio-csit/ubuntu-14.04.4_2016-05-25_1.0"
     node.vm.hostname = name
     node.vm.provision "shell", inline: $user_addition
     node.vm.provision "shell", inline: $install_prereqs
@@ -52,7 +55,7 @@ def add_dut(config, name, mgmt_ip, net1, net2)
     node.vm.network "private_network", type: "dhcp", auto_config: false,
         virtualbox__intnet: net2
     node.vm.provider "virtualbox" do |vb|
-      vb.memory = "2048"
+      vb.memory = "3232"
       vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"]
       vb.customize ["modifyvm", :id, "--nicpromisc4", "allow-all"]
     end
@@ -60,18 +63,35 @@ def add_dut(config, name, mgmt_ip, net1, net2)
 
 end
 
+net_prefix = ''
+if ENV.key?('VPP_VAGRANT_NET_PREFIX')
+  net_prefix = ENV['VPP_VAGRANT_NET_PREFIX'] + '_'
+end
+
 Vagrant.configure(2) do |config|
+  config.vm.box_check_update = false
   config.vm.define "tg" do |tg|
-    tg.vm.box = "puppetlabs/ubuntu-14.04-64-nocm"
+    if Vagrant.has_plugin?("vagrant-proxyconf")
+      if ENV["http_proxy"]
+        config.proxy.http     = ENV["http_proxy"]
+      end
+      if ENV["https_proxy"]
+        config.proxy.https    = ENV["https_proxy"]
+      end
+      if ENV["no_proxy"]
+        config.proxy.no_proxy = ENV["no_proxy"]
+      end
+    end
+    tg.vm.box = "fdio-csit/ubuntu-14.04.4_2016-05-25_1.0"
     tg.vm.hostname = "tg"
 
     tg.vm.provision "shell", inline: $user_addition
     tg.vm.provision "shell", inline: $install_prereqs
     tg.vm.network "private_network", ip: '192.168.255.100/24'
     tg.vm.network "private_network", type: "dhcp", auto_config: false,
-        virtualbox__intnet: "tg_dut1"
+        virtualbox__intnet: net_prefix + "tg_dut1"
     tg.vm.network "private_network", type: "dhcp", auto_config: false,
-        virtualbox__intnet: "tg_dut2"
+        virtualbox__intnet: net_prefix + "tg_dut2"
     tg.vm.provider "virtualbox" do |vb|
       vb.memory = "2048"
       vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"]
@@ -80,7 +100,7 @@ Vagrant.configure(2) do |config|
 
   end
 
-  add_dut(config, "dut1", "192.168.255.101/24", "tg_dut1", "dut1_dut2")
-  add_dut(config, "dut2", "192.168.255.102/24", "tg_dut2", "dut1_dut2")
+  add_dut(config, "dut1", "192.168.255.101/24", net_prefix + "tg_dut1", net_prefix + "dut1_dut2")
+  add_dut(config, "dut2", "192.168.255.102/24", net_prefix + "tg_dut2", net_prefix + "dut1_dut2")
 end