From c2e63feb6209ef504753fe2c975cf61b1c31b5cf Mon Sep 17 00:00:00 2001 From: Marco Varlese Date: Fri, 6 Oct 2017 15:07:08 +0200 Subject: Allow use of /etc/os-release file The top-level Makefile in VPP already uses the file /etc/os-release to recognize which OS the build is being performed on. The scripts for vagrant images instead were still using different files for different distros and adding a new distro to be supported causes issues with the extra-logic to deal with it. This patch aligns the vagrant scripts to use the same approach followed by the top-level Makefile and simplifies the steps to identify / update the OS and build / run VPP. Change-Id: I539f4a7c27b3fef70ed1c12b0276049bc47dc289 Signed-off-by: Marco Varlese --- extras/vagrant/Vagrantfile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'extras/vagrant/Vagrantfile') diff --git a/extras/vagrant/Vagrantfile b/extras/vagrant/Vagrantfile index 714ba94c953..badaa979a43 100644 --- a/extras/vagrant/Vagrantfile +++ b/extras/vagrant/Vagrantfile @@ -9,6 +9,9 @@ Vagrant.configure(2) do |config| 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" else config.vm.box = "puppetlabs/ubuntu-16.04-64-nocm" end -- cgit 1.2.3-korg