Skip to content

Commit

Permalink
Fixes #37685 - Add Secure Boot and TPM options to VMware (#630)
Browse files Browse the repository at this point in the history
- Add `uefi_secure_boot` firmware for UEFI with Secure Boot enabled.
- Add `virtual_tpm` option to compute-attributes.
  • Loading branch information
nofaralfasi authored Dec 9, 2024
1 parent 8fb4800 commit 70fb0e0
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
3 changes: 2 additions & 1 deletion doc/host_create.md
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ Available keys for `--compute-attributes`:
cpus CPU count
corespersocket Number of cores per socket (applicable to hardware versions < 10 only)
memory_mb Integer number, amount of memory in MB
firmware automatic/bios/efi
firmware automatic/bios/uefi/uefi_secure_boot (UEFI with Secure Boot enabled)
cluster Cluster ID from VMware
resource_pool Resource Pool ID from VMware
path Path to folder
Expand All @@ -271,6 +271,7 @@ annotation Annotation Notes
scsi_controllers List with SCSI controllers definitions
type - ID of the controller from VMware
key - Key of the controller (e.g. 1000)
virtual_tpm Must be a 1 or 0, Enable virtual TPM. Only compatible with EFI firmware
start # Must be a 1 or 0, whether to start the machine or not
```

Expand Down
15 changes: 9 additions & 6 deletions lib/hammer_cli_foreman/compute_resource/vmware.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def compute_attributes
['memory_mb', _('Integer number, amount of memory in MB'), { bold: true }],
['path', _('Path to folder'), { bold: true }],
['resource_pool', _('Resource Pool ID from VMware'), { bold: true }],
['firmware', 'automatic/bios/efi'],
['firmware', _('automatic/bios/uefi/uefi_secure_boot (UEFI with Secure Boot enabled)')],
['guest_id', _('Guest OS ID form VMware')],
['hardware_version', _('Hardware version ID from VMware')],
['memoryHotAddEnabled', _('Must be a 1 or 0, lets you add memory resources while the machine is on')],
Expand All @@ -26,10 +26,11 @@ def compute_attributes
['scsi_controllers', [_('List with SCSI controllers definitions'),
' type - ' + _('ID of the controller type from VMware'),
' key - ' + _('Key of the controller (e.g. 1000)')].flatten(1).join("\n")],
['nvme_controllers', [_('List with NVME controllers definitions'),
' type - ' + _('ID of the controller type from VMware'),
' key - ' + _('Key of the controller (e.g. 2000)')].flatten(1).join("\n")],
['boot_order', _('Device names to specify the boot order')]
['nvme_controllers', [_('List with NVME controllers definitions'),
' type - ' + _('ID of the controller type from VMware'),
' key - ' + _('Key of the controller (e.g. 2000)')].flatten(1).join("\n")],
['boot_order', _('Device names to specify the boot order')],
['virtual_tpm', _('Must be a 1 or 0, Enable virtual TPM. Only compatible with EFI firmware.')]
]
end

Expand Down Expand Up @@ -84,7 +85,9 @@ def provider_vm_specific_fields
Fields::Field.new(label: _('Path'), path: [:path]),
Fields::Field.new(label: _('Operating System'), path: [:operatingsystem]),
Fields::Field.new(label: _('Mac'), path: [:mac]),
Fields::List.new(label: _('Boot order'), path: [:boot_order])
Fields::List.new(label: _('Boot order'), path: [:boot_order]),
Fields::Field.new(label: _('Virtual TPM'), path: [:virtual_tpm]),
Fields::Field.new(label: _('Secure Boot'), path: [:secure_boot])
]
end

Expand Down

0 comments on commit 70fb0e0

Please sign in to comment.