diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile index 1093eb5990..98222d0c7f 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', - 'fedora31' => 'generic/fedora31', 'fedora32' => 'generic/fedora32', 'fedora33' => 'generic/fedora33', + 'fedora34' => 'fedora/34-cloud-base', 'arch' => 'generic/arch', 'freebsd12' => 'generic/freebsd12', } @@ -291,8 +291,8 @@ def setup_libvirt(config, vmcpu, vmram, distro) end ################################################################################################# -# Pick the right distro and bootstrap, default is fedora31 -distro = (ENV['SPDK_VAGRANT_DISTRO'] || "fedora31") +# Pick the right distro and bootstrap, default is fedora33 +distro = (ENV['SPDK_VAGRANT_DISTRO'] || "fedora33") 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 88f29f2639..3597288923 100755 --- a/scripts/vagrant/create_vbox.sh +++ b/scripts/vagrant/create_vbox.sh @@ -20,7 +20,7 @@ display_help() { echo " Usage: ${0##*/} [-b nvme-backing-file] [-n ] [-s ] [-x ] [-hvrldcu] " echo echo " distro = " + echo " fedora32 | fedora33 | fedora34 | freebsd11 | freebsd12 | arch | clearlinux>" echo echo " -s in MB Default: ${SPDK_VAGRANT_VMRAM}" echo " -n 1 to 4 Default: ${SPDK_VAGRANT_VMCPU}" @@ -162,7 +162,7 @@ SPDK_VAGRANT_DISTRO="$*" case "${SPDK_VAGRANT_DISTRO}" in centos[78]) ;& ubuntu1[68]04 | ubuntu2004) ;& - fedora3[1-3]) ;& + fedora3[2-4]) ;& freebsd1[12]) ;& arch | clearlinux) export SPDK_VAGRANT_DISTRO