From ba39ecbe3f02c6ded7b9e67a69c1d4f35c5f5e4f Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Thu, 10 Nov 2022 17:23:02 +0100
Subject: [PATCH] Redo vTPM addition configuration
---
.../vmware_extensions.rb | 31 ++++++++++++++-----
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/app/models/concerns/foreman_vmware_advanced/vmware_extensions.rb b/app/models/concerns/foreman_vmware_advanced/vmware_extensions.rb
index 78eb451..cbc5a57 100644
--- a/app/models/concerns/foreman_vmware_advanced/vmware_extensions.rb
+++ b/app/models/concerns/foreman_vmware_advanced/vmware_extensions.rb
@@ -7,18 +7,35 @@ module ForemanVmwareAdvanced
args[:extra_config] = (args[:extra_config] || {}).merge(
'bios.bootOrder': 'ethernet0',
+ 'disk.EnableUUID': 'TRUE',
'svga.autodetect': 'TRUE'
)
- if SETTINGS[:vtpm_csr] && SETTINGS[:vtpm_crt]
- args[:extra_config][:'vtpm.present'] = 'TRUE'
- args[:extra_config][:'vtpm.ekCSR'] = SETTINGS[:vtpm_csr]
- args[:extra_config][:'vtpm.ekCRT'] = SETTINGS[:vtpm_crt]
- end
+ args
+ end
- args[:extra_config][:'disk.EnableUUID'] = 'TRUE' if args[:guest_id]&.start_with?('win')
+ def create_vm(args = {})
+ vm = super(args)
+ return unless vm
- args
+ if SETTINGS[:vtpm_add] && vm.firmware == 'efi'
+ begin
+ spec = {
+ deviceChange: [
+ {
+ operation: :add,
+ device: RbVmomi::VIM::VirtualTPM.new(key: -1)
+ }
+ ]
+ }
+
+ client.vm_reconfig_hardware 'instance_uuid' => vm.attributes[:instance_uuid], 'hardware_spec' => spec
+ rescue StandardError => e
+ logger.error "Failed to add vTPM - #{e.class}: #{e}"
+ end
+ end
+
+ vm
end
end
end
--
GitLab