Inherited firmware/enable_disk_uuid/efi_secure_boot

dstoffel-de · dstoffel-de · commit fed6e6dff43b · 2021-08-03T16:25:06.000+02:00
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" {

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ variable "scsi_controller" {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`variable "enable_disk_uuid" {`
`101`		`- description = "Expose the UUIDs of attached virtual disks to the virtual machine, allowing access to them in the guest."`
	`101`	`+ description = "Expose the UUIDs of attached virtual disks to the virtual machine, allowing access to them in the guest. Default: Inherited from cloned template"`
`102`	`102`	`type = bool`
`103`	`103`	`default = null`
`104`	`104`	`}`
`@@ -232,13 +232,13 @@ variable "dns_suffix_list" {`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`variable "firmware" {`
`235`		`- description = "The firmware interface to use on the virtual machine. Can be one of bios or EFI."`
`236`		`- default = "bios"`
	`235`	`+ description = "The firmware interface to use on the virtual machine. Can be one of bios or EFI. Default: Inherited from cloned template"`
	`236`	`+ default = null`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`variable "efi_secure_boot" {`
`240`		`- description = "Enables EFI secure boot. Can be only be true when firmware is EFI."`
`241`		`- default = "false"`
	`240`	`+ description = "Enables EFI secure boot. Can be only be true when firmware is EFI. Default: Inherited from cloned template"`
	`241`	`+ default = null`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`variable "num_cores_per_socket" {`