From 45088b8eb912cffe9b43aee0a9bb3dcd836d11ef Mon Sep 17 00:00:00 2001
From: AJ Schroeder <6432150+ajschroeder@users.noreply.github.com>
Date: Fri, 12 Jul 2024 15:23:05 -0500
Subject: [PATCH] feat: remove vars that exist in top level var file

---
 .../centos/9-stream/linux-centos-stream.auto.pkrvars.hcl    | 6 ------
 builds/linux/debian/11/linux-debian.auto.pkrvars.hcl        | 6 ------
 builds/linux/debian/12/linux-debian.auto.pkrvars.hcl        | 6 ------
 .../opensuse/leap-15-5/linux-opensuse-leap.auto.pkrvars.hcl | 6 ------
 .../opensuse/leap-15-6/linux-opensuse-leap.auto.pkrvars.hcl | 6 ------
 builds/linux/rocky/8/linux-rocky.auto.pkrvars.hcl           | 6 ------
 builds/linux/rocky/9/linux-rocky.auto.pkrvars.hcl           | 6 ------
 builds/linux/ubuntu/20-04-lts/linux-ubuntu.auto.pkrvars.hcl | 6 ------
 builds/linux/ubuntu/22-04-lts/linux-ubuntu.auto.pkrvars.hcl | 6 ------
 builds/linux/ubuntu/24-04-lts/linux-ubuntu.auto.pkrvars.hcl | 6 ------
 10 files changed, 60 deletions(-)

diff --git a/builds/linux/centos/9-stream/linux-centos-stream.auto.pkrvars.hcl b/builds/linux/centos/9-stream/linux-centos-stream.auto.pkrvars.hcl
index 9a4a965..96149a9 100644
--- a/builds/linux/centos/9-stream/linux-centos-stream.auto.pkrvars.hcl
+++ b/builds/linux/centos/9-stream/linux-centos-stream.auto.pkrvars.hcl
@@ -24,11 +24,8 @@ vm_mem_size             = 2048
 vm_disk_type            = "virtio"
 vm_disk_size            = "32G"
 vm_disk_format          = "raw"
-vm_storage_pool         = "vm-data"
 vm_disk_controller_type = "virtio-scsi-pci"
 vm_network_card_model   = "virtio"
-vm_bridge_interface     = "vmbr0"
-vm_vlan_tag             = "102"
 
 // Removable Media Settings
 iso_path     = "iso"
@@ -41,6 +38,3 @@ vm_boot_wait = "5s"
 
 // EFI Settings
 vm_firmware_path         = "./OVMF.fd"
-vm_efi_storage_pool      = "vm-data"
-vm_efi_pre_enrolled_keys = false
-vm_efi_type              = "4m"
diff --git a/builds/linux/debian/11/linux-debian.auto.pkrvars.hcl b/builds/linux/debian/11/linux-debian.auto.pkrvars.hcl
index bdb07cd..d852b9b 100644
--- a/builds/linux/debian/11/linux-debian.auto.pkrvars.hcl
+++ b/builds/linux/debian/11/linux-debian.auto.pkrvars.hcl
@@ -24,11 +24,8 @@ vm_mem_size             = 2048
 vm_disk_type            = "virtio"
 vm_disk_size            = "32G"
 vm_disk_format          = "raw"
-vm_storage_pool         = "vm-data"
 vm_disk_controller_type = "virtio-scsi-pci"
 vm_network_card_model   = "virtio"
-vm_bridge_interface     = "vmbr0"
-vm_vlan_tag             = "102"
 
 // Removable Media Settings
 iso_path     = "iso"
@@ -41,6 +38,3 @@ vm_boot_wait = "5s"
 
 // EFI Settings
 vm_firmware_path         = "./OVMF.fd"
-vm_efi_storage_pool      = "vm-data"
-vm_efi_pre_enrolled_keys = false
-vm_efi_type              = "4m"
diff --git a/builds/linux/debian/12/linux-debian.auto.pkrvars.hcl b/builds/linux/debian/12/linux-debian.auto.pkrvars.hcl
index 58035ee..089296b 100644
--- a/builds/linux/debian/12/linux-debian.auto.pkrvars.hcl
+++ b/builds/linux/debian/12/linux-debian.auto.pkrvars.hcl
@@ -24,11 +24,8 @@ vm_mem_size             = 2048
 vm_disk_type            = "virtio"
 vm_disk_size            = "32G"
 vm_disk_format          = "raw"
-vm_storage_pool         = "vm-data"
 vm_disk_controller_type = "virtio-scsi-pci"
 vm_network_card_model   = "virtio"
-vm_bridge_interface     = "vmbr0"
-vm_vlan_tag             = "102"
 
 // Removable Media Settings
 iso_path     = "iso"
@@ -41,6 +38,3 @@ vm_boot_wait = "5s"
 
 // EFI Settings
 vm_firmware_path         = "./OVMF.fd"
-vm_efi_storage_pool      = "vm-data"
-vm_efi_pre_enrolled_keys = false
-vm_efi_type              = "4m"
diff --git a/builds/linux/opensuse/leap-15-5/linux-opensuse-leap.auto.pkrvars.hcl b/builds/linux/opensuse/leap-15-5/linux-opensuse-leap.auto.pkrvars.hcl
index f4b0d23..51811ac 100644
--- a/builds/linux/opensuse/leap-15-5/linux-opensuse-leap.auto.pkrvars.hcl
+++ b/builds/linux/opensuse/leap-15-5/linux-opensuse-leap.auto.pkrvars.hcl
@@ -24,11 +24,8 @@ vm_mem_size             = 2048
 vm_disk_type            = "virtio"
 vm_disk_size            = "32G"
 vm_disk_format          = "raw"
-vm_storage_pool         = "vm-data"
 vm_disk_controller_type = "virtio-scsi-pci"
 vm_network_card_model   = "virtio"
-vm_bridge_interface     = "vmbr0"
-vm_vlan_tag             = "102"
 
 // Removable Media Settings
 iso_path     = "iso"
@@ -41,6 +38,3 @@ vm_boot_wait = "5s"
 
 // EFI Settings
 vm_firmware_path         = "./OVMF.fd"
-vm_efi_storage_pool      = "vm-data"
-vm_efi_pre_enrolled_keys = false
-vm_efi_type              = "4m"
diff --git a/builds/linux/opensuse/leap-15-6/linux-opensuse-leap.auto.pkrvars.hcl b/builds/linux/opensuse/leap-15-6/linux-opensuse-leap.auto.pkrvars.hcl
index dfddc68..2eafb69 100644
--- a/builds/linux/opensuse/leap-15-6/linux-opensuse-leap.auto.pkrvars.hcl
+++ b/builds/linux/opensuse/leap-15-6/linux-opensuse-leap.auto.pkrvars.hcl
@@ -24,11 +24,8 @@ vm_mem_size             = 2048
 vm_disk_type            = "virtio"
 vm_disk_size            = "32G"
 vm_disk_format          = "raw"
-vm_storage_pool         = "vm-data"
 vm_disk_controller_type = "virtio-scsi-pci"
 vm_network_card_model   = "virtio"
-vm_bridge_interface     = "vmbr0"
-vm_vlan_tag             = "102"
 
 // Removable Media Settings
 iso_path     = "iso"
@@ -41,6 +38,3 @@ vm_boot_wait = "5s"
 
 // EFI Settings
 vm_firmware_path         = "./OVMF.fd"
-vm_efi_storage_pool      = "vm-data"
-vm_efi_pre_enrolled_keys = false
-vm_efi_type              = "4m"
diff --git a/builds/linux/rocky/8/linux-rocky.auto.pkrvars.hcl b/builds/linux/rocky/8/linux-rocky.auto.pkrvars.hcl
index 028700f..4072f0f 100644
--- a/builds/linux/rocky/8/linux-rocky.auto.pkrvars.hcl
+++ b/builds/linux/rocky/8/linux-rocky.auto.pkrvars.hcl
@@ -24,11 +24,8 @@ vm_mem_size             = 2048
 vm_disk_type            = "virtio"
 vm_disk_size            = "32G"
 vm_disk_format          = "raw"
-vm_storage_pool         = "vm-data"
 vm_disk_controller_type = "virtio-scsi-pci"
 vm_network_card_model   = "virtio"
-vm_bridge_interface     = "vmbr0"
-vm_vlan_tag             = "102"
 
 // Removable Media Settings
 iso_path     = "iso"
@@ -41,6 +38,3 @@ vm_boot_wait = "10s"
 
 // EFI Settings
 vm_firmware_path         = "./OVMF.fd"
-vm_efi_storage_pool      = "vm-data"
-vm_efi_pre_enrolled_keys = false
-vm_efi_type              = "4m"
diff --git a/builds/linux/rocky/9/linux-rocky.auto.pkrvars.hcl b/builds/linux/rocky/9/linux-rocky.auto.pkrvars.hcl
index 06c6d33..69009d4 100644
--- a/builds/linux/rocky/9/linux-rocky.auto.pkrvars.hcl
+++ b/builds/linux/rocky/9/linux-rocky.auto.pkrvars.hcl
@@ -24,11 +24,8 @@ vm_mem_size             = 2048
 vm_disk_type            = "virtio"
 vm_disk_size            = "32G"
 vm_disk_format          = "raw"
-vm_storage_pool         = "vm-data"
 vm_disk_controller_type = "virtio-scsi-pci"
 vm_network_card_model   = "virtio"
-vm_bridge_interface     = "vmbr0"
-vm_vlan_tag             = "102"
 
 // Removable Media Settings
 iso_path     = "iso"
@@ -41,6 +38,3 @@ vm_boot_wait = "10s"
 
 // EFI Settings
 vm_firmware_path         = "./OVMF.fd"
-vm_efi_storage_pool      = "vm-data"
-vm_efi_pre_enrolled_keys = false
-vm_efi_type              = "4m"
diff --git a/builds/linux/ubuntu/20-04-lts/linux-ubuntu.auto.pkrvars.hcl b/builds/linux/ubuntu/20-04-lts/linux-ubuntu.auto.pkrvars.hcl
index e5156d7..8ab65ee 100644
--- a/builds/linux/ubuntu/20-04-lts/linux-ubuntu.auto.pkrvars.hcl
+++ b/builds/linux/ubuntu/20-04-lts/linux-ubuntu.auto.pkrvars.hcl
@@ -24,11 +24,8 @@ vm_mem_size             = 2048
 vm_disk_type            = "virtio"
 vm_disk_size            = "32G"
 vm_disk_format          = "raw"
-vm_storage_pool         = "vm-data"
 vm_disk_controller_type = "virtio-scsi-pci"
 vm_network_card_model   = "virtio"
-vm_bridge_interface     = "vmbr0"
-vm_vlan_tag             = "102"
 
 // Removable Media Settings
 iso_path     = "iso"
@@ -41,6 +38,3 @@ vm_boot_wait = "5s"
 
 // EFI Settings
 vm_firmware_path         = "./OVMF.fd"
-vm_efi_storage_pool      = "vm-data"
-vm_efi_pre_enrolled_keys = false
-vm_efi_type              = "4m"
diff --git a/builds/linux/ubuntu/22-04-lts/linux-ubuntu.auto.pkrvars.hcl b/builds/linux/ubuntu/22-04-lts/linux-ubuntu.auto.pkrvars.hcl
index 136de07..d715a86 100644
--- a/builds/linux/ubuntu/22-04-lts/linux-ubuntu.auto.pkrvars.hcl
+++ b/builds/linux/ubuntu/22-04-lts/linux-ubuntu.auto.pkrvars.hcl
@@ -24,11 +24,8 @@ vm_mem_size             = 2048
 vm_disk_type            = "virtio"
 vm_disk_size            = "32G"
 vm_disk_format          = "raw"
-vm_storage_pool         = "vm-data"
 vm_disk_controller_type = "virtio-scsi-pci"
 vm_network_card_model   = "virtio"
-vm_bridge_interface     = "vmbr0"
-vm_vlan_tag             = "102"
 
 // Removable Media Settings
 iso_path     = "iso"
@@ -41,6 +38,3 @@ vm_boot_wait = "5s"
 
 // EFI Settings
 vm_firmware_path         = "./OVMF.fd"
-vm_efi_storage_pool      = "vm-data"
-vm_efi_pre_enrolled_keys = false
-vm_efi_type              = "4m"
diff --git a/builds/linux/ubuntu/24-04-lts/linux-ubuntu.auto.pkrvars.hcl b/builds/linux/ubuntu/24-04-lts/linux-ubuntu.auto.pkrvars.hcl
index ccfc477..80081dc 100644
--- a/builds/linux/ubuntu/24-04-lts/linux-ubuntu.auto.pkrvars.hcl
+++ b/builds/linux/ubuntu/24-04-lts/linux-ubuntu.auto.pkrvars.hcl
@@ -24,11 +24,8 @@ vm_mem_size             = 2048
 vm_disk_type            = "virtio"
 vm_disk_size            = "32G"
 vm_disk_format          = "raw"
-vm_storage_pool         = "vm-data"
 vm_disk_controller_type = "virtio-scsi-pci"
 vm_network_card_model   = "virtio"
-vm_bridge_interface     = "vmbr0"
-vm_vlan_tag             = "102"
 
 // Removable Media Settings
 iso_path     = "iso"
@@ -41,6 +38,3 @@ vm_boot_wait = "5s"
 
 // EFI Settings
 vm_firmware_path         = "./OVMF.fd"
-vm_efi_storage_pool      = "vm-data"
-vm_efi_pre_enrolled_keys = false
-vm_efi_type              = "4m"