Commit 211be739 authored by Pawel Piatek's avatar Pawel Piatek Committed by Tomasz Zawadzki
Browse files

script/vagrant: split into functions - setup ssh and vagrant-cachier 



Signed-off-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Change-Id: I871ec3f64ba3680ea382ac5e71c5bab4e340c94a
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3716


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 221c5b5e

scripts/vagrant/Vagrantfile

+23 −13
Original line number Diff line number Diff line
@@ -176,6 +176,26 @@ def setup_ocssd_disk(libvirt, disk, index) 
  libvirt.qemuargs :value => "nvme,drive=#{nvme_disk_id},serial=deadbeef,oacs=0,namespaces=1,lver=2,lba_index=4,mdts=10,lnum_lun=8,lnum_pln=2,lpgs_per_blk=1536,lsecs_per_pg=2,lblks_per_pln=45,metadata=#{nvme_disk}_ocssd_md,nsdatafile=#{nvme_disk}_ocssd_blknvme.ns,laer_thread_sleep=3000,stride=4"

end



def setup_ssh(config)

  config.ssh.forward_agent = true

  config.ssh.forward_x11 = true

  if ENV['VAGRANT_PASSWORD_AUTH'] == "1"

    config.ssh.username = "vagrant"

    config.ssh.password = "vagrant"

  end

end



def setup_vagrant_cachier(config, plugins_sync_backend)

  if Vagrant.has_plugin?("vagrant-cachier")

    config.cache.scope = :box

    config.cache.synced_folder_opts = plugins_sync_backend

  else

    puts 'vagrant-cachier caches apt/yum etc to speed subsequent vagrant up'

    puts 'to enable install vagrant-cachier plugin: '

    puts 'vagrant plugin install vagrant-cachier'

  end

end



Vagrant.configure(2) do |config|



  # Pick the right distro and bootstrap, default is fedora30
@@ -230,13 +250,7 @@ Vagrant.configure(2) do |config| 


  # vagrant-cachier caches apt/yum etc to speed subsequent

  # vagrant up

  # to enable, run

  # vagrant plugin install vagrant-cachier

  #

  if Vagrant.has_plugin?("vagrant-cachier")

    config.cache.scope = :box

    config.cache.synced_folder_opts = plugins_sync_backend

  end

  setup_vagrant_cachier(config, plugins_sync_backend)



  # use http proxy if avaiable

  setup_proxy(config, distro)
@@ -251,12 +265,8 @@ Vagrant.configure(2) do |config| 
  # local copy.

  make_spdk_local_copy_of_nfs(config,distro) if plugins_sync_backend[:type] == :nfs



  config.ssh.forward_agent = true

  config.ssh.forward_x11 = true

  if ENV['VAGRANT_PASSWORD_AUTH'] == "1"

    config.ssh.username = "vagrant"

    config.ssh.password = "vagrant"

  end

  # Setup SSH

  setup_ssh(config)



  config.vm.provider "virtualbox" do |vb|

    vb.customize ["modifyvm", :id, "--ioapic", "on"]