diff --git a/packer/templates/vagrant-base-ubuntu-20.04-amd64/template.json.pkr.hcl b/packer/templates/vagrant-base-ubuntu-20.04-amd64/template.json.pkr.hcl index 3cc7f68d..4ae55e06 100644 --- a/packer/templates/vagrant-base-ubuntu-20.04-amd64/template.json.pkr.hcl +++ b/packer/templates/vagrant-base-ubuntu-20.04-amd64/template.json.pkr.hcl @@ -7,11 +7,6 @@ packer { } } -variable "box_basename" { - type = string - default = "ubuntu-20.04" -} - variable "cpus" { type = string default = "2" @@ -22,11 +17,6 @@ variable "disk_size" { default = "20960" } -variable "git_revision" { - type = string - default = "__unknown_git_revision__" -} - variable "headless" { type = string default = "true" @@ -47,60 +37,21 @@ variable "iso_checksum" { default = "f11bda2f2caed8f420802b59f382c25160b114ccc665dbac9c5046e7fceaced2" } -variable "iso_name" { - type = string - default = "ubuntu-20.04.1-legacy-server-amd64.iso" -} - variable "memory" { type = string default = "4096" } -variable "metadata" { - type = string - default = "floppy/dummy_metadata.json" -} - -variable "mirror" { - type = string - default = "http://cdimage.ubuntu.com/ubuntu-legacy-server/releases" -} - -variable "mirror_directory" { - type = string - default = "20.04.1/release/" -} - -variable "name" { - type = string - default = "ubuntu-20.04" -} - variable "no_proxy" { type = string default = "${env("no_proxy")}" } -variable "preseed_path" { - type = string - default = "../../http/ubuntu-20.04/preseed.cfg" -} - variable "template" { type = string default = "vagrant-base-ubuntu-20.04-amd64" } -variable "version" { - type = string - default = "2.1.TIMESTAMP" -} - -locals { - build_timestamp = "${timestamp()}" -} - source "virtualbox-iso" "ubuntu" { boot_command = [ "", @@ -144,7 +95,7 @@ source "virtualbox-iso" "ubuntu" { ssh_password = "vagrant" ssh_port = 22 ssh_username = "vagrant" - ssh_wait_timeout = "10000s" + ssh_timeout = "10000s" vboxmanage = [ ["modifyvm", "{{ .Name }}", "--memory", "${var.memory}"], ["modifyvm", "{{ .Name }}", "--cpus", "${var.cpus}"]