ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scripts/vagrant: use nfs4 instead of sshfs

Browse Source 
Also remove special condition for generic/freebsd because
nfs is included in vagrant by default.

Signed-off-by: Pawel Piatek <pawelx.piatek@intel.com>
Change-Id: I25db4a6ed7f292f42ce0a3e7966a3bafe1c49748
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13623
Reviewed-by: Michal Berger <michal.berger@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Pawel Piatek 2022-07-11 14:21:16 +02:00 committed by Konrad Sztyber
parent 90cd42c287
commit edc93a246b
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/vagrant/Vagrantfile vendored
View File

@ -318,17 +318,12 @@ vmram = (ENV['SPDK_VAGRANT_VMRAM'] || 4096)
force_distro = ENV['FORCE_DISTRO'] == "true" ? true : false force_distro = ENV['FORCE_DISTRO'] == "true" ? true : false
distro_to_use = get_box_type(distro, force_distro) 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 # 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 # 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 # local VM we don't need to worry about saturating the local link so skip
# the compression to speed up the whole transfer. # the compression to speed up the whole transfer.
files_sync_backend = {type: "rsync", rsync__auto: false, rsync__args: ["--archive", "--verbose", "--delete"]} files_sync_backend = {type: "rsync", rsync__auto: false, rsync__args: ["--archive", "--verbose", "--delete"]}
plugins_sync_backend = {type: :sshfs} plugins_sync_backend = {type: :nfs, nfs_udp: false, nfs_version: 4}
end
Vagrant.configure(2) do |config| Vagrant.configure(2) do |config|
config.vm.box = distro_to_use config.vm.box = distro_to_use