From 4c5864c97533e47b5ed7e5a7764fd628c63f3134 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 13 Dec 2018 22:02:46 +0100
Subject: [PATCH] buildserver: add config option to use 'nfs' instead of '9p'

'9p' is not possible when running KVM in VMware.  Also, 'nfs' might provide
more reliably operation on systems that are properly setup for it.
---
 buildserver/Vagrantfile            | 8 ++++++--
 examples/makebuildserver.config.py | 7 +++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile
index 013b5382..392d3df6 100644
--- a/buildserver/Vagrantfile
+++ b/buildserver/Vagrantfile
@@ -43,8 +43,12 @@ Vagrant.configure("2") do |config|
         libvirt.nic_model_type = configfile["libvirt_nic_model_type"]
       end
     end
-    config.vm.synced_folder './', '/vagrant', type: '9p'
-    synced_folder_type = '9p'
+    if configfile.has_key? "synced_folder_type"
+      synced_folder_type = configfile["synced_folder_type"]
+    else
+      synced_folder_type = '9p'
+    end
+    config.vm.synced_folder './', '/vagrant', type: synced_folder_type
   else
     abort("No supported VM Provider found, set vm_provider in Vagrantfile.yaml!")
   end
diff --git a/examples/makebuildserver.config.py b/examples/makebuildserver.config.py
index 9d1dae31..cb47f95f 100644
--- a/examples/makebuildserver.config.py
+++ b/examples/makebuildserver.config.py
@@ -85,3 +85,10 @@
 #
 # libvirt_disk_bus = 'sata'
 # libvirt_nic_model_type = 'rtl8139'
+
+# Sometimes, it is not possible to use the 9p synced folder type with
+# libvirt, like if running a KVM buildserver instance inside of a
+# VMware ESXi guest.  In that case, using NFS or another method is
+# required.
+#
+# synced_folder_type = 'nfs'