Skip to content

Commit

Permalink
vagrant: Update default box to Fedora-23.
Browse files Browse the repository at this point in the history
This brings a newer kernel (4.2) and newer iproute2, allowing more of
the tests to run by default.

Signed-off-by: Joe Stringer <[email protected]>
Acked-by: Andy Zhou <[email protected]>
  • Loading branch information
joestringer committed May 26, 2016
1 parent 6a6b35f commit 53de752
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 53de752

Please sign in to comment.