Skip to content

Commit

Permalink
vagrant: Use official boxes for Fedora and Centos
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
drizzt authored and azhou-nicira committed Mar 8, 2017
1 parent 911b7e9 commit 2fde454
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Vagrantfile
Expand Up @@ -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
Expand Down Expand Up @@ -122,16 +122,17 @@ 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
fedora.vm.provision "test_ovs_kmod", type: "shell", inline: $test_kmod
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
Expand Down

0 comments on commit 2fde454

Please sign in to comment.