Lean on defaults

2022-06-01 10:56:48 -05:00
parent d8509a071f
commit 483f274125
8 changed files with 2 additions and 22 deletions
@@ -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 = [
  "<tab><bs><bs><bs><bs><bs>",
  "net.ifnames=0 biosdevnames=0 inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/fedora/34-x86_64.ks console=ttyS0<enter><wait>"
 ]
-ssh_handshake_attempts = 1000
@@ -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 = [
  "<up><tab><bs><bs><bs><bs><bs>",
  "edd=off net.ifnames=0 biosdevnames=0 inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/fedora/35-x86_64.ks console=ttyS0<enter><wait>"
 ]
-ssh_handshake_attempts = 1000
@@ -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 = [
  "<up><tab><bs><bs><bs><bs><bs>",
  "edd=off net.ifnames=0 biosdevnames=0 inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/fedora/36-x86_64.ks console=ttyS0<enter><wait>"
 ]
-ssh_handshake_attempts = 1000
@@ -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 = [
  "<up><tab><bs><bs><bs><bs><bs>",
  "edd=off net.ifnames=0 biosdevnames=0 inst.ks=http://{{.HTTPIP}}:{{.HTTPPort}}/fedora/rawhide-x86_64.ks console=ttyS0<enter><wait>"
 ]
-ssh_handshake_attempts = 1000
 EOF

 rm -r "${tmp}"
@@ -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 = [
 	"<esc><wait1>",
 	"<f6><esc><bs><bs><bs><bs><bs><bs><bs><bs><bs><bs>",
@@ -18,4 +16,3 @@ boot_command = [
 	"console=ttyS0 ",
 	"<enter><wait1>"
 ]
-ssh_handshake_attempts = 1000
@@ -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/<enter><wait>"
 ]
-ssh_handshake_attempts = 1000
@@ -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<down><down><down><end><bs><bs><bs>",
 	"console=ttyS0 ",
 	"fsck.mode=skip ",
 	"autoinstall ds=\"nocloud-net;s=http://{{.HTTPIP}}:{{.HTTPPort}}/ubuntu/22.04/\" console=ttyS0<F10>"
 ]
-ssh_handshake_attempts = 1000
@@ -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" {