Fix3 rebuild templates

goffinet · Oct 18, 2024 · d1f4cac · d1f4cac
1 parent d289c63
commit d1f4cac
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 22 deletions.
diff --git a/almalinux9.pkr.hcl b/almalinux9.pkr.hcl
@@ -1,4 +1,4 @@
-#Generated by goffinet/packer-kvm/build-packer-templates.yaml at 2024-10-18T18:42:22Z
+#Generated by packer-kvm/build-packer-templates.yaml at 2024-10-18T18:58:32Z
 
 variable "config_file" {
   type    = string

diff --git a/centos9.pkr.hcl b/centos9.pkr.hcl
@@ -1,4 +1,4 @@
-#Generated by goffinet/packer-kvm/build-packer-templates.yaml at 2024-10-18T18:42:22Z
+#Generated by packer-kvm/build-packer-templates.yaml at 2024-10-18T18:58:32Z
 
 variable "config_file" {
   type    = string

diff --git a/fedora40.pkr.hcl b/fedora40.pkr.hcl
@@ -1,4 +1,4 @@
-#Generated by goffinet/packer-kvm/build-packer-templates.yaml at 2024-10-18T18:42:22Z
+#Generated by packer-kvm/build-packer-templates.yaml at 2024-10-18T18:58:32Z
 
 variable "config_file" {
   type    = string

diff --git a/http/almalinux9-kickstart.cfg b/http/almalinux9-kickstart.cfg
@@ -1,4 +1,4 @@
-#Generated by goffinet/packer-kvm/build-packer-templates.yaml at 2024-10-18T18:42:22Z
+#Generated by packer-kvm/build-packer-templates.yaml at 2024-10-18T18:58:32Z
 
 #auth --enableshadow --passalgo=sha512
 url --url="https://repo.almalinux.org/almalinux/9.4/isos/x86_64/kickstart/"

diff --git a/http/centos9-kickstart.cfg b/http/centos9-kickstart.cfg
@@ -1,4 +1,4 @@
-#Generated by goffinet/packer-kvm/build-packer-templates.yaml at 2024-10-18T18:42:22Z
+#Generated by packer-kvm/build-packer-templates.yaml at 2024-10-18T18:58:32Z
 
 #auth --enableshadow --passalgo=sha512
 url --url="https://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os"

diff --git a/http/fedora40-kickstart.cfg b/http/fedora40-kickstart.cfg
@@ -1,4 +1,4 @@
-#Generated by goffinet/packer-kvm/build-packer-templates.yaml at 2024-10-18T18:42:22Z
+#Generated by packer-kvm/build-packer-templates.yaml at 2024-10-18T18:58:32Z
 
 #auth --enableshadow --passalgo=sha512
 url --url="https://fedora.cu.be/linux/releases/40/Server/x86_64/os/"

diff --git a/http/ubuntu2004/user-data b/http/ubuntu2004/user-data
@@ -1,12 +1,12 @@
-#Generated by goffinet/packer-kvm/build-packer-templates.yaml at 2024-10-18T18:42:22Z
+#Generated by packer-kvm/build-packer-templates.yaml at 2024-10-18T18:58:32Z
 
 #cloud-config
 autoinstall:
   version: 1
   identity:
     hostname: ubuntu2004
     username: ubuntu
-    password: $6$rounds=4096$C75guCSbRI55oCzB$yHxL3cwC2lCJIf.LFGUXu3mHkWaoGtEADGOHSydcpI77ymoz7sbCk.009Ch2x7m7z7wykpvHA7wJJgiqBiJG..
+    password: $6$rounds=4096$sYEOKZRp2pWD3Swg$QS1bv.wxi3H2.fJMHpJGaZbwTn9RHR7zoGQXmkJRda.bhq902qwWn.iISp2wP0k1H/yFnyNtzzcyY5ll2S3ls0
   user-data:
     disable_root: false
   keyboard:

diff --git a/http/ubuntu2204/user-data b/http/ubuntu2204/user-data
@@ -1,12 +1,12 @@
-#Generated by goffinet/packer-kvm/build-packer-templates.yaml at 2024-10-18T18:42:22Z
+#Generated by packer-kvm/build-packer-templates.yaml at 2024-10-18T18:58:32Z
 
 #cloud-config
 autoinstall:
   version: 1
   identity:
     hostname: ubuntu2204
     username: ubuntu
-    password: $6$rounds=4096$bfZWCLxOSdDrJsHH$8EJeUzEbk0sEK2fZF5BL.AHt/sZgM86/MJ7fVXy.u98UprTzxR.fakq25PiOmEMJLoOE50XBBNa5A6bDzoJZf1
+    password: $6$rounds=4096$MP8sgNel8MU42/CP$/qO9ECVPRyIl1iZNqCzejbyai2mpB48rkfy6e.CRWNc.6oiofZw9DRnziLiUyw1Bo3ibiPFCHoAUhlUq5YBqv/
   user-data:
     disable_root: false
   keyboard:

diff --git a/http/ubuntu2404/user-data b/http/ubuntu2404/user-data
@@ -1,12 +1,12 @@
-#Generated by goffinet/packer-kvm/build-packer-templates.yaml at 2024-10-18T18:42:22Z
+#Generated by packer-kvm/build-packer-templates.yaml at 2024-10-18T18:58:32Z
 
 #cloud-config
 autoinstall:
   version: 1
   identity:
     hostname: ubuntu2404
     username: ubuntu
-    password: $6$rounds=4096$CEzpY.LQ2GF/VRvk$0FAcsPx83Jv5PGQlXN5adYQ.USXsnT1obepg30eUtyQbBeYk/EYTTgIA9i/Vv6csaUPbC2zXdL2DCNgK7h82W1
+    password: $6$rounds=4096$Q2LYQz7UKErWUoRj$MfZa38yYkIN6XtubYSpDK79OJG0UGowz5CojraqYeEGxD82cAKQoF54P35//Nykc3h4g/u5FKF7Rl6zH54sWg.
   user-data:
     disable_root: false
   keyboard:

diff --git a/roles/build-packer-templates/templates/linux.pkr.hcl.j2 b/roles/build-packer-templates/templates/linux.pkr.hcl.j2
@@ -66,10 +66,10 @@ variable "version" {
 
 source "qemu" "{{ label }}" {
   accelerator      = "kvm"
-  boot_command     = {% if item.flavor == "ubuntu" and item.version == "20.04" %}{{ debian.ubuntu2004.boot_command }}
-  {% elif item.flavor == "ubuntu" and item.version == "22.04" %}{{ debian.ubuntu2204.boot_command }}
-  {% elif item.flavor == "ubuntu" and item.version == "24.04" %}{{ debian.ubuntu2404.boot_command }}
-  {% elif item.type == 'redhat' %}{{ redhat.boot_command }}
+  boot_command     = {% if item.flavor == "ubuntu" and item.version == "20.04" %}{{ debian.ubuntu2004.boot_command | default(item.boot_command) }}
+  {% elif item.flavor == "ubuntu" and item.version == "22.04" %}{{ debian.ubuntu2204.boot_command | default(item.boot_command) }}
+  {% elif item.flavor == "ubuntu" and item.version == "24.04" %}{{ debian.ubuntu2404.boot_command | default(item.boot_command) }}
+  {% elif item.type == 'redhat' %}{{ redhat.boot_command | default(item.boot_command) }}
   {% endif -%}
   disk_cache       = "none"
   disk_compression = true

diff --git a/ubuntu2004.pkr.hcl b/ubuntu2004.pkr.hcl
@@ -1,4 +1,4 @@
-#Generated by goffinet/packer-kvm/build-packer-templates.yaml at 2024-10-18T18:42:22Z
+#Generated by packer-kvm/build-packer-templates.yaml at 2024-10-18T18:58:32Z
 
 variable "config_file" {
   type    = string
@@ -62,7 +62,7 @@ variable "version" {
 
 source "qemu" "ubuntu2004" {
   accelerator      = "kvm"
-  boot_command     = ['<enter><enter><f6><esc><wait>', '<bs><bs><bs><bs>', 'autoinstall net.ifnames=0 biosdevname=0 ip=dhcp ipv6.disable=1 ds=nocloud-net;s=http://{{ .HTTPIP }}:{{ .HTTPPort }}/http/${var.config_file}/ ', '--- <enter>'] | default(item.boot_command) }}
+  boot_command     = ['<enter><enter><f6><esc><wait>', '<bs><bs><bs><bs>', 'autoinstall net.ifnames=0 biosdevname=0 ip=dhcp ipv6.disable=1 ds=nocloud-net;s=http://{{ .HTTPIP }}:{{ .HTTPPort }}/http/${var.config_file}/ ', '--- <enter>']
   disk_cache       = "none"
   disk_compression = true
   disk_discard     = "unmap"

diff --git a/ubuntu2204.pkr.hcl b/ubuntu2204.pkr.hcl
@@ -1,4 +1,4 @@
-#Generated by goffinet/packer-kvm/build-packer-templates.yaml at 2024-10-18T18:42:22Z
+#Generated by packer-kvm/build-packer-templates.yaml at 2024-10-18T18:58:32Z
 
 variable "config_file" {
   type    = string
@@ -62,7 +62,7 @@ variable "version" {
 
 source "qemu" "ubuntu2204" {
   accelerator      = "kvm"
-  boot_command     = ['<esc><esc><esc><esc>e<wait>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', 'linux /casper/vmlinuz --- autoinstall ds="nocloud-net;seedfrom=http://{{ .HTTPIP }}:{{ .HTTPPort }}/http/${var.config_file}/"<enter><wait>', 'initrd /casper/initrd<enter><wait>', 'boot<enter>', '<enter><f10><wait>'] | default(item.boot_command) }}
+  boot_command     = ['<esc><esc><esc><esc>e<wait>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', 'linux /casper/vmlinuz --- autoinstall ds="nocloud-net;seedfrom=http://{{ .HTTPIP }}:{{ .HTTPPort }}/http/${var.config_file}/"<enter><wait>', 'initrd /casper/initrd<enter><wait>', 'boot<enter>', '<enter><f10><wait>']
   disk_cache       = "none"
   disk_compression = true
   disk_discard     = "unmap"

diff --git a/ubuntu2404.pkr.hcl b/ubuntu2404.pkr.hcl
@@ -1,4 +1,4 @@
-#Generated by goffinet/packer-kvm/build-packer-templates.yaml at 2024-10-18T18:42:22Z
+#Generated by packer-kvm/build-packer-templates.yaml at 2024-10-18T18:58:32Z
 
 variable "config_file" {
   type    = string
@@ -62,7 +62,7 @@ variable "version" {
 
 source "qemu" "ubuntu2404" {
   accelerator      = "kvm"
-  boot_command     = ['<esc><esc><esc><esc>e<wait>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', 'linux /casper/vmlinuz --- autoinstall ds="nocloud-net;seedfrom=http://{{ .HTTPIP }}:{{ .HTTPPort }}/http/${var.config_file}/"<enter><wait>', 'initrd /casper/initrd<enter><wait>', 'boot<enter>', '<enter><f10><wait>'] | default(item.boot_command) }}
+  boot_command     = ['<esc><esc><esc><esc>e<wait>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', '<del><del><del><del><del><del><del><del>', 'linux /casper/vmlinuz --- autoinstall ds="nocloud-net;seedfrom=http://{{ .HTTPIP }}:{{ .HTTPPort }}/http/${var.config_file}/"<enter><wait>', 'initrd /casper/initrd<enter><wait>', 'boot<enter>', '<enter><f10><wait>']
   disk_cache       = "none"
   disk_compression = true
   disk_discard     = "unmap"