Commit e9d44aa3 authored by Michal Berger's avatar Michal Berger Committed by Konrad Sztyber
Browse files

scripts/vagrant: Remove support for spdk-5.0.0 fork ns config 



But leave the shortcut for configuring nvme with a single namespace.

Change-Id: I0e5745db481b24ab813ec1e98426d709cde216fd
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/17769


Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
parent fa3f818b

scripts/vagrant/Vagrantfile

+1 −6
Original line number Diff line number Diff line
@@ -160,15 +160,10 @@ def setup_nvme_disk(libvirt, disk, index) 
    namespace_disks = namespace_disks + nvme_disk.split()

  elsif !nvme_namespaces[index].nil? && !nvme_namespaces[index].match(/^[0-9]+$/)

    namespace_disks = namespace_disks + nvme_disk.split() + nvme_namespaces[index].split(':')

  elsif !nvme_namespaces[index].nil? && nvme_namespaces[index].match(/^[0-9]+$/)

    # Compatibility with spdk-5.0.0 fork

  elsif !nvme_namespaces[index].nil? && nvme_namespaces[index] == "1"

    libvirt.qemuargs :value => "-drive"

    libvirt.qemuargs :value => "format=raw,file=#{nvme_disk},if=none,id=#{nvme_disk_id}"

    if nvme_namespaces[index] == "1"

      nvme_controller <<",drive=#{nvme_disk_id}"

    else

      nvme_controller <<",namespaces=#{nvme_namespaces[index]},drive=#{nvme_disk_id}"

    end

  end



  if !nvme_cmbs[index].nil? && nvme_cmbs[index] != ""