aboutsummaryrefslogtreecommitdiffstats
path: root/openbsd-image
diff options
context:
space:
mode:
Diffstat (limited to 'openbsd-image')
-rw-r--r--openbsd-image/main.pkr.hcl2
-rw-r--r--openbsd-image/openbsd-amd64.pkr.hcl44
-rw-r--r--openbsd-image/openbsd-arm64.pkr.hcl36
-rw-r--r--openbsd-image/variables.pkr.hcl2
4 files changed, 42 insertions, 42 deletions
diff --git a/openbsd-image/main.pkr.hcl b/openbsd-image/main.pkr.hcl
index 43d01dd..2728e1f 100644
--- a/openbsd-image/main.pkr.hcl
+++ b/openbsd-image/main.pkr.hcl
@@ -13,7 +13,7 @@ build {
}
provisioner "shell" {
- script = "scripts/setup.sh"
+ script = "scripts/setup.sh"
environment_vars = ["ADMIN_USER=${var.admin_user}"]
}
diff --git a/openbsd-image/openbsd-amd64.pkr.hcl b/openbsd-image/openbsd-amd64.pkr.hcl
index e19b208..7cbb24b 100644
--- a/openbsd-image/openbsd-amd64.pkr.hcl
+++ b/openbsd-image/openbsd-amd64.pkr.hcl
@@ -1,21 +1,21 @@
source "qemu" "openbsd-amd64" {
- vm_name = "openbsd-${var.version}-amd64.raw"
- iso_url = "${var.mirror}/pub/OpenBSD/${var.version}/${var.arch}/install${local.version_short}.iso"
- iso_checksum = "file:${var.mirror}/pub/OpenBSD/${var.version}/${var.arch}/SHA256"
- output_directory = "build"
- qemu_binary = "qemu-system-x86_64"
- machine_type = "q35"
- cpu_model = "max"
- accelerator = "tcg"
- cpus = var.cpus
- memory = var.memory
- disk_interface = "virtio"
- disk_size = "${var.disk_size}G"
- disk_compression = true
- format = "raw"
- ssh_username = "root"
- ssh_password = local.root_password
- ssh_timeout = "30m"
+ vm_name = "openbsd-${var.version}-amd64.raw"
+ iso_url = "${var.mirror}/pub/OpenBSD/${var.version}/${var.arch}/install${local.version_short}.iso"
+ iso_checksum = "file:${var.mirror}/pub/OpenBSD/${var.version}/${var.arch}/SHA256"
+ output_directory = "build"
+ qemu_binary = "qemu-system-x86_64"
+ machine_type = "q35"
+ cpu_model = "max"
+ accelerator = "tcg"
+ cpus = var.cpus
+ memory = var.memory
+ disk_interface = "virtio"
+ disk_size = "${var.disk_size}G"
+ disk_compression = true
+ format = "raw"
+ ssh_username = "root"
+ ssh_password = local.root_password
+ ssh_timeout = "30m"
http_port_min = local.http_port
http_port_max = local.http_port
@@ -38,13 +38,13 @@ source "qemu" "openbsd-amd64" {
var.disklabel_template != "" ? { "/disklabel" = var.disklabel_template } : {}
)
- boot_command = [
+ boot_command = [
"<wait>S<enter><wait>",
"autoinstall<enter><wait>",
"http://{{ .HTTPIP }}:{{ .HTTPPort }}/install.conf<enter>",
]
- boot_wait = "20s"
- shutdown_command = "shutdown -p now"
- headless = false
- qemuargs = [["-display", "cocoa"]]
+ boot_wait = "20s"
+ shutdown_command = "shutdown -p now"
+ headless = false
+ qemuargs = [["-display", "cocoa"]]
}
diff --git a/openbsd-image/openbsd-arm64.pkr.hcl b/openbsd-image/openbsd-arm64.pkr.hcl
index b8845ff..3749486 100644
--- a/openbsd-image/openbsd-arm64.pkr.hcl
+++ b/openbsd-image/openbsd-arm64.pkr.hcl
@@ -1,21 +1,21 @@
source "qemu" "openbsd-arm64" {
- vm_name = "openbsd-${var.version}-aarch64.qcow2"
- iso_url = "${var.mirror}/pub/OpenBSD/${var.version}/${var.arch}/install${local.version_short}.iso"
- iso_checksum = "file:${var.mirror}/pub/OpenBSD/${var.version}/${var.arch}/SHA256"
- output_directory = "build"
- qemu_binary = "qemu-system-aarch64"
- machine_type = "virt"
- cpu_model = "host"
- accelerator = "hvf"
- cpus = var.cpus
- memory = var.memory
- disk_interface = "virtio"
- disk_size = "${var.disk_size}G"
- disk_compression = true
- format = "qcow2"
- ssh_username = "root"
- ssh_password = local.root_password
- ssh_timeout = "10m"
+ vm_name = "openbsd-${var.version}-aarch64.qcow2"
+ iso_url = "${var.mirror}/pub/OpenBSD/${var.version}/${var.arch}/install${local.version_short}.iso"
+ iso_checksum = "file:${var.mirror}/pub/OpenBSD/${var.version}/${var.arch}/SHA256"
+ output_directory = "build"
+ qemu_binary = "qemu-system-aarch64"
+ machine_type = "virt"
+ cpu_model = "host"
+ accelerator = "hvf"
+ cpus = var.cpus
+ memory = var.memory
+ disk_interface = "virtio"
+ disk_size = "${var.disk_size}G"
+ disk_compression = true
+ format = "qcow2"
+ ssh_username = "root"
+ ssh_password = local.root_password
+ ssh_timeout = "10m"
http_port_min = local.http_port
http_port_max = local.http_port
@@ -38,7 +38,7 @@ source "qemu" "openbsd-arm64" {
var.disklabel_template != "" ? { "/disklabel" = var.disklabel_template } : {}
)
- boot_command = [
+ boot_command = [
"<wait>S<enter><wait>",
"autoinstall<enter><wait>",
"http://{{ .HTTPIP }}:{{ .HTTPPort }}/install.conf<enter>",
diff --git a/openbsd-image/variables.pkr.hcl b/openbsd-image/variables.pkr.hcl
index 0577253..24fdbd1 100644
--- a/openbsd-image/variables.pkr.hcl
+++ b/openbsd-image/variables.pkr.hcl
@@ -8,7 +8,7 @@ variable "version" {
}
variable "arch" {
- type = string
+ type = string
validation {
condition = contains(["amd64", "arm64"], var.arch)
error_message = "The arch must be one of: amd64, arm64."