diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile index 2dbf4f3b7..bd32ded00 100644 --- a/scripts/vagrant/Vagrantfile +++ b/scripts/vagrant/Vagrantfile @@ -13,9 +13,9 @@ def get_box_type(distro) 'ubuntu1604' => 'peru/ubuntu-16.04-server-amd64', 'ubuntu1804' => 'peru/ubuntu-18.04-server-amd64', 'ubuntu2004' => 'peru/ubuntu-20.04-server-amd64', - 'fedora30' => 'generic/fedora30', 'fedora31' => 'generic/fedora31', 'fedora32' => 'generic/fedora32', + 'fedora33' => 'generic/fedora33', 'arch' => 'generic/arch', 'freebsd11' => 'generic/freebsd11', 'freebsd12' => 'generic/freebsd12', @@ -278,8 +278,8 @@ def setup_libvirt(config, vmcpu, vmram, distro) end ################################################################################################# -# Pick the right distro and bootstrap, default is fedora30 -distro = (ENV['SPDK_VAGRANT_DISTRO'] || "fedora30") +# Pick the right distro and bootstrap, default is fedora31 +distro = (ENV['SPDK_VAGRANT_DISTRO'] || "fedora31") provider = (ENV['SPDK_VAGRANT_PROVIDER'] || "virtualbox") # Get all variables for creating vm diff --git a/scripts/vagrant/create_vbox.sh b/scripts/vagrant/create_vbox.sh index f0229383d..4c9e6cb10 100755 --- a/scripts/vagrant/create_vbox.sh +++ b/scripts/vagrant/create_vbox.sh @@ -19,8 +19,8 @@ display_help() { echo echo " Usage: ${0##*/} [-b nvme-backing-file] [-n ] [-s ] [-x ] [-hvrldcu] " echo - echo " distro = " + echo " distro = " echo echo " -s in MB Default: ${SPDK_VAGRANT_VMRAM}" echo " -n 1 to 4 Default: ${SPDK_VAGRANT_VMCPU}" @@ -49,13 +49,13 @@ display_help() { echo echo " Examples:" echo - echo " $0 -x http://user:password@host:port fedora30" + echo " $0 -x http://user:password@host:port fedora33" echo " $0 -s 2048 -n 2 ubuntu16" echo " $0 -rv freebsd" - echo " $0 fedora30" - echo " $0 -b /var/lib/libvirt/images/nvme1.img,nvme,1 fedora30" - echo " $0 -b /var/lib/libvirt/images/ocssd.img,ocssd fedora30" - echo " $0 -b /var/lib/libvirt/images/nvme5.img,nvme,5 -b /var/lib/libvirt/images/ocssd.img,ocssd fedora30" + echo " $0 fedora33" + echo " $0 -b /var/lib/libvirt/images/nvme1.img,nvme,1 fedora33" + echo " $0 -b /var/lib/libvirt/images/ocssd.img,ocssd fedora33" + echo " $0 -b /var/lib/libvirt/images/nvme5.img,nvme,5 -b /var/lib/libvirt/images/ocssd.img,ocssd fedora33" echo } @@ -173,15 +173,15 @@ case "${SPDK_VAGRANT_DISTRO}" in ubuntu2004) export SPDK_VAGRANT_DISTRO ;; - fedora30) - export SPDK_VAGRANT_DISTRO - ;; fedora31) export SPDK_VAGRANT_DISTRO ;; fedora32) export SPDK_VAGRANT_DISTRO ;; + fedora33) + export SPDK_VAGRANT_DISTRO + ;; freebsd11) export SPDK_VAGRANT_DISTRO ;;