From 392a53d88b6b861c4613ad45d0c87dc243578b33 Mon Sep 17 00:00:00 2001
From: Matt Prahl <mprahl@redhat.com>
Date: Tue, 6 Dec 2016 13:17:05 -0500
Subject: [PATCH] Fix Vagrant and add libvirt support

---
 Vagrantfile           | 8 +++-----
 conf/config.py        | 3 +--
 docs/CONTRIBUTING.rst | 8 +++++++-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 3cc6b850..52351e38 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -24,19 +24,17 @@ $script = <<SCRIPT
         rpm-build \
         swig \
         systemd-devel
+    systemctl enable fedmsg-relay
+    systemctl start fedmsg-relay
     cd /tmp/module_build_service
     python setup.py install
     mbs-upgradedb
     mbs-gencert
-    systemctl enable fedmsg-relay
-    systemctl start fedmsg-relay
     echo "export KRB5CCNAME=FILE:/var/tmp/krbcc" >> ~/.bashrc
 SCRIPT
 
 Vagrant.configure("2") do |config|
-  # $ wget https://download.fedoraproject.org/pub/fedora/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-Vagrant-24-1.2.x86_64.vagrant-libvirt.box && \
-  #   vagrant box add Fedora-Cloud-Base-Vagrant-24-1.2.x86_64.vagrant-libvirt.box --name fedora-24
-  config.vm.box = "fedora-24"
+  config.vm.box = "fedora/24-cloud-base"
   config.vm.synced_folder "./", "/tmp/module_build_service"
   config.vm.provision "file", source: "/var/tmp/krbcc", destination: "/var/tmp/krbcc", run: "always"
   config.vm.network "forwarded_port", guest: 5000, host: 5000
diff --git a/conf/config.py b/conf/config.py
index 36d0b15a..6d30f682 100644
--- a/conf/config.py
+++ b/conf/config.py
@@ -15,7 +15,7 @@ class BaseConfiguration(object):
         dbdir, 'module_build_service.db'))
     SQLALCHEMY_TRACK_MODIFICATIONS = True
     # Where we should run when running "manage.py runssl" directly.
-    HOST = '127.0.0.1'
+    HOST = '0.0.0.0'
     PORT = 5000
 
     # Global network-related values, in seconds
@@ -86,7 +86,6 @@ class BaseConfiguration(object):
 class DevConfiguration(BaseConfiguration):
     LOG_BACKEND = 'console'
     LOG_LEVEL = 'debug'
-    HOST = '0.0.0.0'
 
     # Global network-related values, in seconds
     NET_TIMEOUT = 5
diff --git a/docs/CONTRIBUTING.rst b/docs/CONTRIBUTING.rst
index 2777c779..572ba330 100644
--- a/docs/CONTRIBUTING.rst
+++ b/docs/CONTRIBUTING.rst
@@ -51,7 +51,13 @@ command will pull the latest base image and perform a clean build without using
 Vagrant
 -------
 
-Once your environment is setup, run (depending on your OS, you may need to run it with sudo)::
+If you are using VirtualBox, you will need to install the Vagrant plugin `vagrant-vbguest`.
+This plugin automatically installs guest additions to Vagrant guests that do not have them installed.
+The official Fedora Vagrant box unfortunately does not contain the guest additions, and they are needed for folder syncing::
+
+    $ vagrant plugin install vagrant-vbguest
+
+To launch Vagrant, run (depending on your OS, you may need to run it with sudo)::
 
     $ vagrant up