From 2fde4546d118f2683658c384f31ebe361c906f34 Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <tredaelli@redhat.com>
Date: Thu, 9 Feb 2017 15:00:36 +0100
Subject: vagrant: Use official boxes for Fedora and Centos

Change CentOS version to last 7 (7.3 at the moment),
since old kernel-devel version is no longer available.

Add net-tools to CentOS since netstat is needed for some tests.

Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
Signed-off-by: Andy Zhou <azhou@ovn.org>
---
 Vagrantfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'Vagrantfile')

diff --git a/Vagrantfile b/Vagrantfile
index 8439918ab..5296279e7 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -37,7 +37,7 @@ yum -y install autoconf automake openssl-devel libtool \
                python-twisted-core python-zope-interface \
                desktop-file-utils groff graphviz rpmdevtools nc curl \
                wget python-six pyftpdlib checkpolicy selinux-policy-devel \
-               libcap-ng-devel kernel-devel-`uname -r` ethtool
+               libcap-ng-devel kernel-devel-`uname -r` ethtool net-tools
 SCRIPT
 
 $configure_ovs = <<SCRIPT
@@ -122,7 +122,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
        debian.vm.provision "install_deb", type: "shell", inline: $install_deb
   end
   config.vm.define "fedora-23" do |fedora|
-       fedora.vm.box = "bento/fedora-23"
+       fedora.vm.box = "fedora/23-cloud-base"
+       fedora.vm.synced_folder ".", "/vagrant", type: "rsync"
        fedora.vm.provision "bootstrap", type: "shell", inline: $bootstrap_fedora
        fedora.vm.provision "configure_ovs", type: "shell", inline: $configure_ovs
        fedora.vm.provision "build_ovs", type: "shell", inline: $build_ovs
@@ -130,8 +131,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
        fedora.vm.provision "test_ovs_system_userspace", type: "shell", inline: $test_ovs_system_userspace
        fedora.vm.provision "install_rpm", type: "shell", inline: $install_rpm
   end
-  config.vm.define "centos-7.2" do |centos|
-       centos.vm.box = "bento/centos-7.2"
+  config.vm.define "centos-7" do |centos|
+       centos.vm.box = "centos/7"
        centos.vm.synced_folder ".", "/vagrant", type: "rsync"
        centos.vm.provision "bootstrap", type: "shell", inline: $bootstrap_centos
        centos.vm.provision "configure_ovs", type: "shell", inline: $configure_ovs
-- 
cgit v1.2.1