From 25503a0b7b5af1df7204c3824be04c999feafaf3 Mon Sep 17 00:00:00 2001
From: Filip Valder <fvalder@redhat.com>
Date: Thu, 5 Jan 2017 13:46:43 +0100
Subject: [PATCH] separate script section for running services; forward
 communication to 127.0.0.1

---
 Vagrantfile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index cb371640..2cad9aba 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -31,24 +31,28 @@ $script = <<SCRIPT
         systemd-devel
     mkdir /usr/share/fedmsg
     chown fedmsg:fedmsg /usr/share/fedmsg
-    systemctl enable fedmsg-relay
-    systemctl start fedmsg-relay
     mkdir /etc/module-build-service/
     cd /tmp/module_build_service
     python setup.py develop
     pip install -r test-requirements.txt
-    mbs-upgradedb
-    mbs-gencert
 SCRIPT
 
+$script_services = <<SCRIPT_SERVICES
+    cd /tmp/module_build_service
+    mbs-upgradedb > /tmp/mbs-base.out 2>&1
+    mbs-gencert >> /tmp/mbs-base.out 2>&1
+    fedmsg-relay < /dev/null >& /tmp/fedmsg-relay.out &
+    fedmsg-hub < /dev/null >& /tmp/fedmsg-hub.out &
+    mbs-frontend < /dev/null >& /tmp/mbs-frontend.out &
+SCRIPT_SERVICES
+
 Vagrant.configure("2") do |config|
   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
-  config.vm.network "forwarded_port", guest: 2001, host: 5001
-  config.vm.network "forwarded_port", guest: 13747, host: 13747
+  config.vm.network "forwarded_port", guest_ip: "127.0.0.1", guest: 5000, host: 5000
+  config.vm.network "forwarded_port", guest_ip: "127.0.0.1", guest: 2001, host: 5001
+  config.vm.network "forwarded_port", guest_ip: "127.0.0.1", guest: 13747, host: 13747
   config.vm.provision "shell", inline: $script
-  config.vm.provision :shell, inline: "mbs-frontend &", run: "always"
-  config.vm.provision :shell, inline: "cd /tmp/module_build_service && fedmsg-hub &", run: "always"
+  config.vm.provision "shell", inline: $script_services, run: "always"
 end