Commit edc93a24 authored by Pawel Piatek's avatar Pawel Piatek Committed by Konrad Sztyber
Browse files

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: default avatarPawel Piatek <pawelx.piatek@intel.com>
Change-Id: I25db4a6ed7f292f42ce0a3e7966a3bafe1c49748
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13623


Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 90cd42c2

scripts/vagrant/Vagrantfile

+6 −11
Original line number Diff line number Diff line
@@ -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

plugins_sync_backend = {type: :nfs, nfs_udp: false, nfs_version: 4}



Vagrant.configure(2) do |config|

  config.vm.box = distro_to_use