Skip to content

Commit

Permalink
Format all the hcl2 files
Browse files Browse the repository at this point in the history
  • Loading branch information
taylorific committed Sep 24, 2023
1 parent 4603563 commit 0606985
Show file tree
Hide file tree
Showing 13 changed files with 81 additions and 82 deletions.
18 changes: 9 additions & 9 deletions centos/centos.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,25 @@ variable "iso_url" {
}

variable "vm_name" {
type = string
type = string
default = "centos-7-x86_64"
}

source "qemu" "centos" {
disk_compression = true
disk_image = true
disk_size = "30G"
iso_checksum = var.iso_checksum
iso_url = var.iso_url
disk_image = true
disk_size = "30G"
iso_checksum = var.iso_checksum
iso_url = var.iso_url
qemuargs = [
["-cdrom", "cidata.iso"]
]
output_directory = "output-${var.vm_name}"
shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
ssh_password = var.ssh_password
ssh_timeout = "120s"
ssh_username = var.ssh_username
vm_name = var.vm_name
ssh_password = var.ssh_password
ssh_timeout = "120s"
ssh_username = var.ssh_username
vm_name = var.vm_name
# efi_boot = true
# efi_firmware_code = "/usr/share/OVMF/OVMF_CODE.fd"
# efi_firmware_vars = "/usr/share/OVMF/OVMF_VARS.fd"
Expand Down
18 changes: 9 additions & 9 deletions debian/debian.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,25 @@ variable "iso_url" {
}

variable "vm_name" {
type = string
type = string
default = "debian-12-x86_64"
}

source "qemu" "debian" {
disk_compression = true
disk_image = true
disk_size = "30G"
iso_checksum = var.iso_checksum
iso_url = var.iso_url
disk_image = true
disk_size = "30G"
iso_checksum = var.iso_checksum
iso_url = var.iso_url
qemuargs = [
["-cdrom", "cidata.iso"]
]
output_directory = "output-${var.vm_name}"
shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
ssh_password = var.ssh_password
ssh_timeout = "120s"
ssh_username = var.ssh_username
vm_name = var.vm_name
ssh_password = var.ssh_password
ssh_timeout = "120s"
ssh_username = var.ssh_username
vm_name = var.vm_name
# efi_boot = true
# efi_firmware_code = "/usr/share/OVMF/OVMF_CODE.fd"
# efi_firmware_vars = "/usr/share/OVMF/OVMF_VARS.fd"
Expand Down
4 changes: 2 additions & 2 deletions oraclelinux/oraclelinux-7-x86_64.pkrvars.hcl
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
iso_checksum = "sha256:f15f95b30f059ba744ecb32d724a25c323291c12a2398ad472c545da1f757e8c"
iso_url = "https://yum.oracle.com/templates/OracleLinux/OL7/u9/x86_64/OL7U9_x86_64-kvm-b145.qcow"
vm_name = "oraclelinux-7-x86_64"
iso_url = "https://yum.oracle.com/templates/OracleLinux/OL7/u9/x86_64/OL7U9_x86_64-kvm-b145.qcow"
vm_name = "oraclelinux-7-x86_64"
4 changes: 2 additions & 2 deletions oraclelinux/oraclelinux-8-x86_64.pkrvars.hcl
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
iso_checksum = "sha256:67b644451efe5c9c472820922085cb5112e305fedfb5edb1ab7020b518ba8c3b"
iso_url = "https://yum.oracle.com/templates/OracleLinux/OL8/u8/x86_64/OL8U8_x86_64-kvm-b198.qcow"
vm_name = "oraclelinux-8-x86_64"
iso_url = "https://yum.oracle.com/templates/OracleLinux/OL8/u8/x86_64/OL8U8_x86_64-kvm-b198.qcow"
vm_name = "oraclelinux-8-x86_64"
4 changes: 2 additions & 2 deletions oraclelinux/oraclelinux-9-x86_64.pkrvars.hcl
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
iso_checksum = "840345cb866837ac7cc7c347cd9a8196c3a17e9c054c613eda8c2a912434c956"
iso_url = "https://yum.oracle.com/templates/OracleLinux/OL9/u2/x86_64/OL9U2_x86_64-kvm-b197.qcow"
vm_name = "oraclelinux-9-x86_64"
iso_url = "https://yum.oracle.com/templates/OracleLinux/OL9/u2/x86_64/OL9U2_x86_64-kvm-b197.qcow"
vm_name = "oraclelinux-9-x86_64"
18 changes: 9 additions & 9 deletions oraclelinux/oraclelinux.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -46,25 +46,25 @@ variable "iso_url" {
}

variable "vm_name" {
type = string
type = string
default = "oraclelinux-8-x86_64"
}

source "qemu" "oraclelinux" {
disk_compression = true
disk_image = true
disk_size = "48G"
iso_checksum = var.iso_checksum
iso_url = var.iso_url
disk_image = true
disk_size = "48G"
iso_checksum = var.iso_checksum
iso_url = var.iso_url
qemuargs = [
["-cdrom", "cidata.iso"]
]
output_directory = "output-${var.vm_name}"
shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
ssh_password = var.ssh_password
ssh_timeout = "120s"
ssh_username = var.ssh_username
vm_name = var.vm_name
ssh_password = var.ssh_password
ssh_timeout = "120s"
ssh_username = var.ssh_username
vm_name = var.vm_name
}

build {
Expand Down
4 changes: 2 additions & 2 deletions ubuntu/aarch64/ubuntu-20.04-aarch64.pkrvars.hcl
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
iso_checksum = "file:https://cloud-images.ubuntu.com/releases/22.04/release/SHA256SUMS"
iso_url = "https://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-arm64.img"
vm_name = "ubuntu-20.04-aarch64"
iso_url = "https://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-arm64.img"
vm_name = "ubuntu-20.04-aarch64"
5 changes: 2 additions & 3 deletions ubuntu/aarch64/ubuntu-22.04-aarch64.pkrvars.hcl
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
iso_checksum = "file:http://cloud-images.ubuntu.com/releases/22.04/release/SHA256SUMS"
iso_url = "https://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04
-server-cloudimg-arm64.img"
vm_name = "ubuntu-22.04-aarch64"
iso_url = "https://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-arm64.img"
vm_name = "ubuntu-22.04-aarch64"
36 changes: 18 additions & 18 deletions ubuntu/aarch64/ubuntu.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -46,35 +46,35 @@ variable "iso_url" {
}

variable "vm_name" {
type = string
type = string
default = "ubuntu-22.04-aarch64"
}

source "qemu" "ubuntu" {
disk_compression = true
disk_image = true
disk_size = "30G"
format = "qcow2"
iso_checksum = var.iso_checksum
iso_url = var.iso_url
qemu_binary = "qemu-system-aarch64"
disk_image = true
disk_size = "30G"
format = "qcow2"
iso_checksum = var.iso_checksum
iso_url = var.iso_url
qemu_binary = "qemu-system-aarch64"
qemuargs = [
["-cdrom", "cidata.iso"],
["-cpu", "max"],
["-boot", "strict=on"],
["-monitor", "none"],
["-device", "virtio-gpu-pci"],
]
output_directory = "output-${var.vm_name}"
shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
ssh_password = var.ssh_password
ssh_timeout = "120s"
ssh_username = var.ssh_username
vm_name = var.vm_name
machine_type = "virt"
net_device = "virtio-net"
disk_interface = "virtio"
efi_boot = true
output_directory = "output-${var.vm_name}"
shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
ssh_password = var.ssh_password
ssh_timeout = "120s"
ssh_username = var.ssh_username
vm_name = var.vm_name
machine_type = "virt"
net_device = "virtio-net"
disk_interface = "virtio"
efi_boot = true
efi_firmware_code = "/usr/share/AAVMF/AAVMF_CODE.fd"
efi_firmware_vars = "/usr/share/AAVMF/AAVMF_VARS.fd"
}
Expand All @@ -83,7 +83,7 @@ build {
sources = ["source.qemu.ubuntu"]

provisioner "shell" {
execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'"
execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'"
expect_disconnect = true
scripts = [
"../scripts/disable-updates.sh",
Expand Down
6 changes: 3 additions & 3 deletions ubuntu/x86_64/ubuntu-20.04-bios-x86_64.pkrvars.hcl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
efi_boot = false
efi_boot = false
iso_checksum = "file:http://cloud-images.ubuntu.com/releases/focal/release/SHA256SUMS"
iso_url = "http://cloud-images.ubuntu.com/releases/focal/release/ubuntu-20.04-server-cloudimg-amd64.img"
vm_name = "ubuntu-20.04-bios-x86_64"
iso_url = "http://cloud-images.ubuntu.com/releases/focal/release/ubuntu-20.04-server-cloudimg-amd64.img"
vm_name = "ubuntu-20.04-bios-x86_64"
6 changes: 3 additions & 3 deletions ubuntu/x86_64/ubuntu-22.04-bios-x86_64.pkrvars.hcl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
efi_boot = false
efi_boot = false
iso_checksum = "file:http://cloud-images.ubuntu.com/releases/22.04/release/SHA256SUMS"
iso_url = "http://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-amd64.img"
vm_name = "ubuntu-22.04-bios-x86_64"
iso_url = "http://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-amd64.img"
vm_name = "ubuntu-22.04-bios-x86_64"
8 changes: 4 additions & 4 deletions ubuntu/x86_64/ubuntu-22.04-x86_64.pkrvars.hcl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
efi_boot = true
efi_boot = true
efi_firmware_code = "/usr/share/OVMF/OVMF_CODE.fd"
efi_firmware_vars = "/usr/share/OVMF/OVMF_VARS.fd"
iso_checksum = "file:http://cloud-images.ubuntu.com/releases/22.04/release/SHA256SUMS"
iso_url = "http://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-amd64.img"
vm_name = "ubuntu-22.04-x86_64"
iso_checksum = "file:http://cloud-images.ubuntu.com/releases/22.04/release/SHA256SUMS"
iso_url = "http://cloud-images.ubuntu.com/releases/22.04/release/ubuntu-22.04-server-cloudimg-amd64.img"
vm_name = "ubuntu-22.04-x86_64"
32 changes: 16 additions & 16 deletions ubuntu/x86_64/ubuntu.pkr.hcl
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
variable "efi_boot" {
type = bool
type = bool
default = false
}

variable "efi_firmware_code" {
type = string
type = string
default = null
}

variable "efi_firmware_vars" {
type = string
type = string
default = null
}

Expand Down Expand Up @@ -61,26 +61,26 @@ variable "iso_url" {
}

variable "vm_name" {
type = string
type = string
default = "ubuntu-22.04-x86_64"
}

source "qemu" "ubuntu" {
disk_compression = true
disk_image = true
disk_size = "30G"
iso_checksum = var.iso_checksum
iso_url = var.iso_url
disk_image = true
disk_size = "30G"
iso_checksum = var.iso_checksum
iso_url = var.iso_url
qemuargs = [
["-cdrom", "cidata.iso"]
]
output_directory = "output-${var.vm_name}"
shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
ssh_password = var.ssh_password
ssh_timeout = "120s"
ssh_username = var.ssh_username
vm_name = var.vm_name
efi_boot = var.efi_boot
output_directory = "output-${var.vm_name}"
shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
ssh_password = var.ssh_password
ssh_timeout = "120s"
ssh_username = var.ssh_username
vm_name = var.vm_name
efi_boot = var.efi_boot
efi_firmware_code = var.efi_firmware_code
efi_firmware_vars = var.efi_firmware_vars
}
Expand All @@ -89,7 +89,7 @@ build {
sources = ["source.qemu.ubuntu"]

provisioner "shell" {
execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'"
execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'"
expect_disconnect = true
scripts = [
"../scripts/disable-updates.sh",
Expand Down

0 comments on commit 0606985

Please sign in to comment.