Update executor to Ubuntu 20.04, also with python3

Change-Id: Ieda93331a71ab5d8e7a29a13ce64f92573f2567c
diff --git a/packer/vars/ubuntu-18.04.json b/packer/vars/ubuntu-18.04.json
deleted file mode 100644
index 37e4ba7..0000000
--- a/packer/vars/ubuntu-18.04.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "source_ami_filter_name": "*ubuntu*18.04*",
-  "source_ami_filter_owner": "aws-marketplace",
-  "source_ami_filter_product_code": "3iplms73etrdhxdepv72l6ywj",
-  "ssh_user": "ubuntu",
-
-  "distro": "Ubuntu 18.04",
-  "arch": "x86_64",
-  "cloud_user_data": "provision/null_data.sh"
-}
diff --git a/packer/vars/ubuntu-20.04.json b/packer/vars/ubuntu-20.04.json
new file mode 100644
index 0000000..2faf415
--- /dev/null
+++ b/packer/vars/ubuntu-20.04.json
@@ -0,0 +1,10 @@
+{
+  "source_ami_filter_name": "*ubuntu-focal-20.04-amd64-server*",
+  "source_ami_filter_owner": "679593333241",
+  "source_ami_filter_product_code": "a8jyynf4hjutohctm41o2z18m",
+  "ssh_user": "ubuntu",
+
+  "distro": "Ubuntu 20.04",
+  "arch": "x86_64",
+  "cloud_user_data": "provision/null_data.sh"
+}