From 55de68f109ca18607dcf76a3eef00722c498179a Mon Sep 17 00:00:00 2001
From: Maciej Wawryk <maciejx.wawryk@intel.com>
Date: Mon, 16 Nov 2020 12:22:31 +0100
Subject: [PATCH] scripts/vagrant: Add ubuntu 20.04 into vagrant setup scripts

Fixes issue #1680.

Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I6a7c1c2ba2f72c82cec10c7a46207ab528c22d2b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5109
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
---
 scripts/vagrant/Vagrantfile    | 1 +
 scripts/vagrant/create_vbox.sh | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile
index f9ddf7a98..2dbf4f3b7 100644
--- a/scripts/vagrant/Vagrantfile
+++ b/scripts/vagrant/Vagrantfile
@@ -12,6 +12,7 @@ def get_box_type(distro)
     'centos8'    => 'centos/8',
     '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',
diff --git a/scripts/vagrant/create_vbox.sh b/scripts/vagrant/create_vbox.sh
index 69231534d..f0229383d 100755
--- a/scripts/vagrant/create_vbox.sh
+++ b/scripts/vagrant/create_vbox.sh
@@ -19,7 +19,7 @@ display_help() {
 	echo
 	echo " Usage: ${0##*/} [-b nvme-backing-file] [-n <num-cpus>] [-s <ram-size>] [-x <http-proxy>] [-hvrldcu] <distro>"
 	echo
-	echo "  distro = <centos7 | centos8| ubuntu1604 | ubuntu1804 | fedora30 |"
+	echo "  distro = <centos7 | centos8| ubuntu1604 | ubuntu1804 | ubuntu2004 | fedora30 |"
 	echo "            fedora31 | fedora32 | freebsd11 | freebsd12 | arch | clearlinux>"
 	echo
 	echo "  -s <ram-size> in MB             Default: ${SPDK_VAGRANT_VMRAM}"
@@ -170,6 +170,9 @@ case "${SPDK_VAGRANT_DISTRO}" in
 	ubuntu1804)
 		export SPDK_VAGRANT_DISTRO
 		;;
+	ubuntu2004)
+		export SPDK_VAGRANT_DISTRO
+		;;
 	fedora30)
 		export SPDK_VAGRANT_DISTRO
 		;;