vom: Add support for redirect contracts in gbp

[vpp.git] / extras / vagrant / Vagrantfile

diff --git a/extras/vagrant/Vagrantfile b/extras/vagrant/Vagrantfile
index 07db660..a97a3dc 100644 (file)
--- a/extras/vagrant/Vagrantfile
+++ b/extras/vagrant/Vagrantfile
@@ -6,8 +6,14 @@ Vagrant.configure(2) do |config|
   # Pick the right distro and bootstrap, default is ubuntu1604
   distro = ( ENV['VPP_VAGRANT_DISTRO'] || "ubuntu1604")
   if distro == 'centos7'
-    config.vm.box = "puppetlabs/centos-7.2-64-nocm"
+    config.vm.box = "centos/7"
+    config.vm.box_version = "1708.01"
     config.ssh.insert_key = false
+  elsif distro == 'opensuse'
+    config.vm.box = "opensuse/openSUSE-42.3-x86_64"
+    config.vm.box_version = "1.0.4.20170726"
+  elsif distro == 'ubuntu1804'
+    config.vm.box = "bento/ubuntu-18.04"
   else
     config.vm.box = "puppetlabs/ubuntu-16.04-64-nocm"
   end
@@ -23,8 +29,6 @@ Vagrant.configure(2) do |config|
     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")
-  elsif post_build == "vcl-test"
-    config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"vcl_test.sh"), :args => "/vpp vagrant"
   end
 
   # Add .gnupg dir in so folks can sign patches