Update vagrant centos config to CentOS 7.4

Change-Id: I45c1227b53ba9e57b94f1bc68de939cd3ce9d619
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

diff --git a/extras/vagrant/Vagrantfile b/extras/vagrant/Vagrantfile
index 8d6d02a..714ba94 100644 (file)
--- a/extras/vagrant/Vagrantfile
+++ b/extras/vagrant/Vagrantfile
@@ -6,7 +6,8 @@ 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
   else
     config.vm.box = "puppetlabs/ubuntu-16.04-64-nocm"

diff --git a/extras/vagrant/Vagrantfile.vcl_test b/extras/vagrant/Vagrantfile.vcl_test
index 92d6832..d055942 100644 (file)
--- a/extras/vagrant/Vagrantfile.vcl_test
+++ b/extras/vagrant/Vagrantfile.vcl_test
@@ -6,7 +6,8 @@ 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
   else
     config.vm.box = "puppetlabs/ubuntu-16.04-64-nocm"

diff --git a/extras/vagrant/update.sh b/extras/vagrant/update.sh
index b630449..b4962bf 100755 (executable)
--- a/extras/vagrant/update.sh
+++ b/extras/vagrant/update.sh
@@ -42,6 +42,11 @@ if [ $DISTRIB_ID == "Ubuntu" ]; then
     # Install useful but non-mandatory tools
     apt-get install -y emacs x11-utils git-review gdb gdbserver xfce4-terminal iperf3
 elif [ $DISTRIB_ID == "CentOS" ]; then
+    if [ "$(echo $DISTRIB_RELEASE | cut -d'.' -f1)" == "7" ]; then
+        rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+        yum groupinstall "X Window system" -y
+        yum groupinstall xfce -y
+    fi
     # Standard update + upgrade dance
     yum check-update
     yum update -y