From 483f27412576db12d04c498e2546dd892a010fac Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Wed, 1 Jun 2022 10:56:04 -0500 Subject: [PATCH] Lean on defaults --- distros/fedora-34-x86_64.pkrvars.hcl | 3 --- distros/fedora-35-x86_64.pkrvars.hcl | 3 --- distros/fedora-36-x86_64.pkrvars.hcl | 3 --- distros/fedora-rawhide-x86_64.pkrvars.hcl.sh | 3 --- distros/ubuntu-18.04-x86_64.pkrvars.hcl | 3 --- distros/ubuntu-20.04-x86_64.pkrvars.hcl | 2 -- distros/ubuntu-22.04-x86_64.pkrvars.hcl | 3 --- sources/inputs.pkr.hcl | 4 ++-- 8 files changed, 2 insertions(+), 22 deletions(-) diff --git a/distros/fedora-34-x86_64.pkrvars.hcl b/distros/fedora-34-x86_64.pkrvars.hcl index 6946958..c6b2038 100644 --- a/distros/fedora-34-x86_64.pkrvars.hcl +++ b/distros/fedora-34-x86_64.pkrvars.hcl @@ -1,13 +1,10 @@ distro = "fedora" -arch = "x86_64" version = "34" iso = { url = "https://download.fedoraproject.org/pub/fedora/linux/releases/34/Server/x86_64/iso/Fedora-Server-netinst-x86_64-34-1.2.iso" checksum = "e1a38b9faa62f793ad4561b308c31f32876cfaaee94457a7a9108aaddaeec406" } -boot_wait = "20s" boot_command = [ "", "net.ifnames=0 biosdevnames=0 inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/fedora/34-x86_64.ks console=ttyS0" ] -ssh_handshake_attempts = 1000 diff --git a/distros/fedora-35-x86_64.pkrvars.hcl b/distros/fedora-35-x86_64.pkrvars.hcl index 0c5fe7e..654872e 100644 --- a/distros/fedora-35-x86_64.pkrvars.hcl +++ b/distros/fedora-35-x86_64.pkrvars.hcl @@ -1,13 +1,10 @@ distro = "fedora" -arch = "x86_64" version = "35" iso = { url = "https://download.fedoraproject.org/pub/fedora/linux/releases/35/Server/x86_64/iso/Fedora-Server-dvd-x86_64-35-1.2.iso" checksum = "3fe521d6c7b12c167f3ac4adab14c1f344dd72136ba577aa2bcc4a67bcce2bc6" } -boot_wait = "20s" boot_command = [ "", "edd=off net.ifnames=0 biosdevnames=0 inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/fedora/35-x86_64.ks console=ttyS0" ] -ssh_handshake_attempts = 1000 diff --git a/distros/fedora-36-x86_64.pkrvars.hcl b/distros/fedora-36-x86_64.pkrvars.hcl index b84b36b..3ee255d 100644 --- a/distros/fedora-36-x86_64.pkrvars.hcl +++ b/distros/fedora-36-x86_64.pkrvars.hcl @@ -1,13 +1,10 @@ distro = "fedora" -arch = "x86_64" version = "36" iso = { url = "https://download.fedoraproject.org/pub/fedora/linux/releases/36/Server/x86_64/iso/Fedora-Server-dvd-x86_64-36-1.5.iso" checksum = "5edaf708a52687b09f9810c2b6d2a3432edac1b18f4d8c908c0da6bde0379148" } -boot_wait = "20s" boot_command = [ "", "edd=off net.ifnames=0 biosdevnames=0 inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/fedora/36-x86_64.ks console=ttyS0" ] -ssh_handshake_attempts = 1000 diff --git a/distros/fedora-rawhide-x86_64.pkrvars.hcl.sh b/distros/fedora-rawhide-x86_64.pkrvars.hcl.sh index e246579..e5be336 100755 --- a/distros/fedora-rawhide-x86_64.pkrvars.hcl.sh +++ b/distros/fedora-rawhide-x86_64.pkrvars.hcl.sh @@ -28,18 +28,15 @@ sha="$(cat "${checksums}" | grep dvd | grep SHA256 | cut -d' ' -f 4)" # Write out HCL file cat << EOF > "${name}" distro = "fedora" -arch = "x86_64" version = "rawhide" iso = { url = "${iso}" checksum = "${sha}" } -boot_wait = "20s" boot_command = [ "", "edd=off net.ifnames=0 biosdevnames=0 inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/fedora/rawhide-x86_64.ks console=ttyS0" ] -ssh_handshake_attempts = 1000 EOF rm -r "${tmp}" diff --git a/distros/ubuntu-18.04-x86_64.pkrvars.hcl b/distros/ubuntu-18.04-x86_64.pkrvars.hcl index 69aed4d..4b53779 100644 --- a/distros/ubuntu-18.04-x86_64.pkrvars.hcl +++ b/distros/ubuntu-18.04-x86_64.pkrvars.hcl @@ -1,5 +1,4 @@ distro = "ubuntu" -arch = "x86_64" version = "18.04" iso = { #url = "http://releases.ubuntu.com/18.04/ubuntu-18.04.6-live-server-amd64.iso" @@ -7,7 +6,6 @@ iso = { url = "http://cdimage.ubuntu.com/ubuntu/releases/18.04/release/ubuntu-18.04.6-server-amd64.iso" checksum = "f5cbb8104348f0097a8e513b10173a07dbc6684595e331cb06f93f385d0aecf6" } -boot_wait = "15s" boot_command = [ "", "", @@ -18,4 +16,3 @@ boot_command = [ "console=ttyS0 ", "" ] -ssh_handshake_attempts = 1000 diff --git a/distros/ubuntu-20.04-x86_64.pkrvars.hcl b/distros/ubuntu-20.04-x86_64.pkrvars.hcl index 7c54de0..6cd60a1 100644 --- a/distros/ubuntu-20.04-x86_64.pkrvars.hcl +++ b/distros/ubuntu-20.04-x86_64.pkrvars.hcl @@ -1,5 +1,4 @@ distro = "ubuntu" -arch = "x86_64" version = "20.04" iso = { url = "https://releases.ubuntu.com/20.04/ubuntu-20.04.4-live-server-amd64.iso" @@ -12,4 +11,3 @@ boot_command = [ "fsck.mode=skip ", "autoinstall ds=nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/20.04/" ] -ssh_handshake_attempts = 1000 diff --git a/distros/ubuntu-22.04-x86_64.pkrvars.hcl b/distros/ubuntu-22.04-x86_64.pkrvars.hcl index d514583..f07ae2d 100644 --- a/distros/ubuntu-22.04-x86_64.pkrvars.hcl +++ b/distros/ubuntu-22.04-x86_64.pkrvars.hcl @@ -1,15 +1,12 @@ distro = "ubuntu" -arch = "x86_64" version = "22.04" iso = { url = "https://releases.ubuntu.com/jammy/ubuntu-22.04-live-server-amd64.iso" checksum = "84aeaf7823c8c61baa0ae862d0a06b03409394800000b3235854a6b38eb4856f" } -boot_wait = "15s" boot_command = [ "e", "console=ttyS0 ", "fsck.mode=skip ", "autoinstall ds=\"nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/22.04/\" console=ttyS0" ] -ssh_handshake_attempts = 1000 diff --git a/sources/inputs.pkr.hcl b/sources/inputs.pkr.hcl index e941ea5..a9bd52c 100644 --- a/sources/inputs.pkr.hcl +++ b/sources/inputs.pkr.hcl @@ -20,7 +20,7 @@ variable "version" { variable "boot_wait" { type = string - default = "20s" + default = "15s" description = "Length of time to wait before entering boot commands" } @@ -39,7 +39,7 @@ variable "boot_command" { variable "ssh_handshake_attempts" { type = number - default = 100 + default = 1000 } variable "shutdown_command" {