From 53de7528be8edb9de83532d6b129f9124485eabd Mon Sep 17 00:00:00 2001 From: Joe Stringer Date: Wed, 25 May 2016 17:17:37 -0700 Subject: vagrant: Update default box to Fedora-23. This brings a newer kernel (4.2) and newer iproute2, allowing more of the tests to run by default. Signed-off-by: Joe Stringer Acked-by: Andy Zhou --- INSTALL.md | 2 +- Vagrantfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 5b37786d9..8a4a5b339 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -608,7 +608,7 @@ tree as found locally in a virtual machine using the following commands: vagrant up vagrant ssh -This will bring up w Fedora 20 VM by default, alternatively the +This will bring up w Fedora 23 VM by default, alternatively the `Vagrantfile` can be modified to use a different distribution box as base. Also, the VM can be reprovisioned at any time: diff --git a/Vagrantfile b/Vagrantfile index 8912a3279..69c1deaef 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -42,7 +42,7 @@ cp openvswitch-$PACKAGE_VERSION.tar.gz $HOME/rpmbuild/SOURCES rpmbuild --bb -D "kversion `uname -r`" /vagrant/rhel/openvswitch-kmod-fedora.spec rpmbuild --bb --without check /vagrant/rhel/openvswitch-fedora.spec rpm -e openvswitch -rpm -ivh $HOME/rpmbuild/RPMS/x86_64/openvswitch-$PACKAGE_VERSION-1.fc22.x86_64.rpm +rpm -ivh $HOME/rpmbuild/RPMS/x86_64/openvswitch-$PACKAGE_VERSION-1.fc23.x86_64.rpm systemctl enable openvswitch systemctl start openvswitch systemctl status openvswitch @@ -54,8 +54,8 @@ make check-system-userspace SCRIPT Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.define "fedora-22" do |fedora| - fedora.vm.box = "bento/fedora-22" + config.vm.define "fedora-23" do |fedora| + fedora.vm.box = "bento/fedora-23" 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 -- cgit v1.2.1