From edc93a246b86d3e37107459c6b8d22de8abf72ab Mon Sep 17 00:00:00 2001 From: Pawel Piatek Date: Mon, 11 Jul 2022 14:21:16 +0200 Subject: [PATCH] scripts/vagrant: use nfs4 instead of sshfs Also remove special condition for generic/freebsd because nfs is included in vagrant by default. Signed-off-by: Pawel Piatek Change-Id: I25db4a6ed7f292f42ce0a3e7966a3bafe1c49748 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13623 Reviewed-by: Michal Berger Reviewed-by: Karol Latecki Tested-by: SPDK CI Jenkins Reviewed-by: Konrad Sztyber Reviewed-by: Jim Harris --- scripts/vagrant/Vagrantfile | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile index d4c66c9d1..02c8403df 100644 --- a/scripts/vagrant/Vagrantfile +++ b/scripts/vagrant/Vagrantfile @@ -318,17 +318,12 @@ vmram = (ENV['SPDK_VAGRANT_VMRAM'] || 4096) force_distro = ENV['FORCE_DISTRO'] == "true" ? true : false distro_to_use = get_box_type(distro, force_distro) -if (distro_to_use.include?("generic/freebsd")) - files_sync_backend = {type: :nfs, nfs_udp: false, mount_options: ['ro']} - plugins_sync_backend = {type: :nfs, nfs_udp: false} -else - # Remove --copy-links from default rsync cmdline since we do want to sync - # actual symlinks as well. Also, since copy is made between host and its - # local VM we don't need to worry about saturating the local link so skip - # the compression to speed up the whole transfer. - files_sync_backend = {type: "rsync", rsync__auto: false, rsync__args: ["--archive", "--verbose", "--delete"]} - plugins_sync_backend = {type: :sshfs} -end +# Remove --copy-links from default rsync cmdline since we do want to sync +# actual symlinks as well. Also, since copy is made between host and its +# local VM we don't need to worry about saturating the local link so skip +# the compression to speed up the whole transfer. +files_sync_backend = {type: "rsync", rsync__auto: false, rsync__args: ["--archive", "--verbose", "--delete"]} +plugins_sync_backend = {type: :nfs, nfs_udp: false, nfs_version: 4} Vagrant.configure(2) do |config| config.vm.box = distro_to_use