Skip to content

Commit 9b3188d

Browse files
committed
Format oraclelinux templates
1 parent 7659111 commit 9b3188d

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# https://yum.oracle.com/oracle-linux-templates.html
22
iso_checksum = "0dfbae649781c801f8dc873a771a689d1bc63f22b8aa57e6d0a601b64ef32b1f"
3-
iso_url = "https://yum.oracle.com/templates/OracleLinux/OL9/u5/aarch64/OL9U5_aarch64-kvm-b126.qcow2"
4-
vm_name = "oracle-linux-9-aarch64"
3+
iso_url = "https://yum.oracle.com/templates/OracleLinux/OL9/u5/aarch64/OL9U5_aarch64-kvm-b126.qcow2"
4+
vm_name = "oracle-linux-9-aarch64"

oraclelinux/cloud/aarch64/oracle-linux.pkr.hcl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@ source "qemu" "oracle-linux" {
8383
["-monitor", "none"],
8484
/* ["-device", "virtio-gpu-pci"], */
8585
]
86-
output_directory = "output-${var.vm_name}"
87-
shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
88-
ssh_password = var.ssh_password
89-
ssh_timeout = "120s"
90-
ssh_username = var.ssh_username
91-
vm_name = "${var.vm_name}.qcow2"
86+
output_directory = "output-${var.vm_name}"
87+
shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
88+
ssh_password = var.ssh_password
89+
ssh_timeout = "120s"
90+
ssh_username = var.ssh_username
91+
vm_name = "${var.vm_name}.qcow2"
9292
efi_boot = true
9393
efi_firmware_code = "/usr/share/AAVMF/AAVMF_CODE.fd"
94-
efi_firmware_vars = "/usr/share/AAVMF/AAVMF_VARS.fd"
94+
efi_firmware_vars = "/usr/share/AAVMF/AAVMF_VARS.fd"
9595
}
9696

9797
build {
@@ -100,7 +100,7 @@ build {
100100
# cloud-init may still be running when we start executing scripts
101101
# To avoid race conditions, make sure cloud-init is done first
102102
provisioner "shell" {
103-
execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'"
103+
execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'"
104104
scripts = [
105105
"../scripts/cloud-init-wait.sh",
106106
]
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# https://yum.oracle.com/oracle-linux-templates.html
22
efi_boot = false
33
iso_checksum = "f1b8f0ca281570dda5e844485d6a300d1a13a629272ffdff4ec84bf56b76b1fc"
4-
iso_url = "https://yum.oracle.com/templates/OracleLinux/OL9/u5/x86_64/OL9U5_x86_64-kvm-b259.qcow2"
5-
vm_name = "oracle-linux-9-bios-x86_64"
4+
iso_url = "https://yum.oracle.com/templates/OracleLinux/OL9/u5/x86_64/OL9U5_x86_64-kvm-b259.qcow2"
5+
vm_name = "oracle-linux-9-bios-x86_64"

oraclelinux/cloud/x86_64/oracle-linux.pkr.hcl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,18 +84,18 @@ source "qemu" "oracle-linux" {
8484
disk_compression = true
8585
disk_image = true
8686
disk_size = "42G"
87-
headless = var.headles
87+
headless = var.headless
8888
iso_checksum = var.iso_checksum
8989
iso_url = var.iso_url
9090
qemuargs = [
9191
["-cdrom", "boot-${var.vm_name}/cidata.iso"]
9292
]
93-
output_directory = "output-${var.vm_name}"
94-
shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
95-
ssh_password = var.ssh_password
96-
ssh_timeout = "120s"
97-
ssh_username = var.ssh_username
98-
vm_name = "${var.vm_name}.qcow2"
93+
output_directory = "output-${var.vm_name}"
94+
shutdown_command = "echo '${var.ssh_password}' | sudo -S shutdown -P now"
95+
ssh_password = var.ssh_password
96+
ssh_timeout = "120s"
97+
ssh_username = var.ssh_username
98+
vm_name = "${var.vm_name}.qcow2"
9999
efi_boot = var.efi_boot
100100
efi_firmware_code = var.efi_firmware_code
101101
efi_firmware_vars = var.efi_firmware_vars
@@ -107,7 +107,7 @@ build {
107107
# cloud-init may still be running when we start executing scripts
108108
# To avoid race conditions, make sure cloud-init is done first
109109
provisioner "shell" {
110-
execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'"
110+
execute_command = "echo '${var.ssh_password}' | {{ .Vars }} sudo -S -E sh -eux '{{ .Path }}'"
111111
scripts = [
112112
"../scripts/cloud-init-wait.sh",
113113
]

0 commit comments

Comments
 (0)