vagrant: Provide basic Vagrantfile

This is a basic Vagrantfile which compiles and provisions the local OVS
source tree in a Fedora 20 VM. The Vagrantfile.in can be extended to
support additional distributions.

To use this Vagrantfile:
 1. Install Vagrant plus a compatible hypervisor
 2. Run configure to translate Vagrantfile.in to Vagrantfile
 3. Run `vagrant up` to create & provision the VM
 4. Run `vagrant ssh` to log into the VM

Signed-off-by: Thomas Graf <tgraf@noironetworks.com>
Acked-by: Kyle Mestery <mestery@mestery.com>

diff --git a/.gitignore b/.gitignore
index 50ec1d7af017cc204de0370ede99d887335cb786..a3522d8e67c6229b2426278f568424484347904c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,5 @@ tags
 _debian
 odp-netlink.h
 OvsDpInterface.h
+Vagrantfile
+/.vagrant/

diff --git a/INSTALL.md b/INSTALL.md
index 941cf37bebe1a4e810d181315a2ca8a359afd8bc..122c3623544a3eeb9575448499ce4292b2b3fa03 100644 (file)
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -562,6 +562,24 @@ test failures that you believe to represent bugs in Open vSwitch.
 Include the precise versions of Open vSwitch and Ryu in your bug
 report, plus any other information needed to reproduce the problem.
 
+Vagrant
+-------
+
+Requires: Vagrant and a compatible hypervisor
+
+A Vagrantfile is provided allowing to compile and provision the source
+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
+`Vagrantfile.in` can be modified to use a different distribution box as
+base. Also, the VM can be reprovisioned at any time to recompile and
+reinstall OVS:
+
+       vagrant provision
+
 Continuous Integration with Travis-CI
 -------------------------------------
 

diff --git a/Makefile.am b/Makefile.am
index 46e861039cb297c56dd7fb1ab32ea02a6bf0d0de..e209e3c7e37d765ef87662b5f88b522952ce5538 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,7 +103,8 @@ EXTRA_DIST = \
        build-aux/sodepends.pl \
        build-aux/soexpand.pl \
        $(MAN_FRAGMENTS) \
-       $(MAN_ROOTS)
+       $(MAN_ROOTS) \
+       Vagrantfile.in
 bin_PROGRAMS =
 sbin_PROGRAMS =
 bin_SCRIPTS =

diff --git a/Vagrantfile.in b/Vagrantfile.in
new file mode 100644 (file)
index 0000000..ba10ede
--- /dev/null
+++ b/Vagrantfile.in
@@ -0,0 +1,30 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+$bootstrap_fedora = <<SCRIPT
+yum -y update
+yum -y install autoconf automake openssl-devel libtool \
+               python-twisted-core python-zope-interface PyQt4 \
+              desktop-file-utils groff graphviz rpmdevtools
+cd /vagrant
+./boot.sh && ./configure
+make clean && make dist
+rpmdev-setuptree
+cp openvswitch-@PACKAGE_VERSION@.tar.gz $HOME/rpmbuild/SOURCES
+rpmbuild --bb --without check rhel/openvswitch-fedora.spec
+rpm -e openvswitch
+rpm -ivh $HOME/rpmbuild/RPMS/x86_64/openvswitch-@PACKAGE_VERSION@-1.fc20.x86_64.rpm
+systemctl enable openvswitch
+systemctl start openvswitch
+systemctl status openvswitch
+SCRIPT
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.vm.define "fedora-20" do |fedora|
+    fedora.vm.box = "chef/fedora-20"
+    fedora.vm.provision :shell, inline: $bootstrap_fedora
+  end
+end

diff --git a/configure.ac b/configure.ac
index ebb8b02c90d06dac32562bb887facf1e83d0db3f..03f93698ca611717ddfeae328906d74b0a68daa7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,7 @@ AC_CONFIG_FILES(lib/libsflow.pc)
 AC_CONFIG_FILES(ofproto/libofproto.pc)
 AC_CONFIG_FILES(ovsdb/libovsdb.pc)
 AC_CONFIG_FILES(include/openvswitch/version.h)
+AC_CONFIG_FILES(Vagrantfile)
 
 dnl This makes sure that include/openflow gets created in the build directory.
 AC_CONFIG_COMMANDS([include/openflow/openflow.h.stamp])