Merge pull request #102 from dstoffel/feature/inherited-firmware-uuid…

…-secureboot Inherited firmware/enable_disk_uuid/efi_secure_boot
Terraform-VMWare-Modules · Aug 11, 2021 · be8f023 · be8f023
2 parents d72889e + fed6e6d
commit be8f023
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/main.tf b/main.tf
@@ -66,9 +66,9 @@ resource "vsphere_virtual_machine" "vm" {
   custom_attributes       = var.custom_attributes
   annotation              = var.annotation
   extra_config            = var.extra_config
-  firmware                = var.firmware
-  efi_secure_boot_enabled = var.efi_secure_boot
-  enable_disk_uuid        = var.enable_disk_uuid
+  firmware                = var.firmware == null ? data.vsphere_virtual_machine.template.firmware : var.firmware
+  efi_secure_boot_enabled = var.efi_secure_boot == null ? data.vsphere_virtual_machine.template.efi_secure_boot_enabled : var.efi_secure_boot
+  enable_disk_uuid        = var.enable_disk_uuid == null ? data.vsphere_virtual_machine.template.enable_disk_uuid : var.enable_disk_uuid
   storage_policy_id       = var.storage_policy_id
 
   datastore_cluster_id = var.datastore_cluster != "" ? data.vsphere_datastore_cluster.datastore_cluster[0].id : null

diff --git a/variables.tf b/variables.tf
@@ -98,7 +98,7 @@ variable "scsi_controller" {
 }
 
 variable "enable_disk_uuid" {
-  description = "Expose the UUIDs of attached virtual disks to the virtual machine, allowing access to them in the guest."
+  description = "Expose the UUIDs of attached virtual disks to the virtual machine, allowing access to them in the guest. Default: Inherited from cloned template"
   type        = bool
   default     = null
 }
@@ -232,13 +232,13 @@ variable "dns_suffix_list" {
 }
 
 variable "firmware" {
-  description = "The firmware interface to use on the virtual machine. Can be one of bios or EFI."
-  default     = "bios"
+  description = "The firmware interface to use on the virtual machine. Can be one of bios or EFI. Default: Inherited from cloned template"
+  default     = null
 }
 
 variable "efi_secure_boot" {
-  description = "Enables EFI secure boot. Can be only be true when firmware is EFI."
-  default     = "false"
+  description = "Enables EFI secure boot. Can be only be true when firmware is EFI. Default: Inherited from cloned template"
+  default     = null
 }
 
 variable "num_cores_per_socket" {