Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add firmware and boot_options to VM configuration #1109

Merged
merged 41 commits into from
Sep 14, 2023
Merged

Add firmware and boot_options to VM configuration #1109

merged 41 commits into from
Sep 14, 2023

Conversation

adezxc
Copy link

@adezxc adezxc commented Aug 18, 2023 •
edited
Loading

This PR introduces new fields to vcd_vm and vcd_vapp_vm resources and datasources:

  • firmware specify either EFI or BIOS (37.1+)
  • boot_options block:
    • efi_secure_boot (37.1+)
    • boot_delay
    • boot_retry_enabled(37.1+)
    • boot_retry_delay(37.1+)
    • enter_bios_setup

Closes #1078

Adam Jasinski added 6 commits August 18, 2023 18:34
add firmware and bootoptions to vm resource
d5ad1b0 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
tidy OsTypes section
2193aff 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
update docs
45a42cb 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
add tests, improve update/create
ee1fa6c 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
add versioncheck
978c012 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
update datasource tests
9b659c6 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
@adezxc adezxc marked this pull request as ready for review August 21, 2023 13:11
add changelog entry
e181416 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
@adezxc adezxc changed the title Add VM Boot Options Add firmware and boot_options to VM configuration Aug 21, 2023
Adam Jasinski added 5 commits August 21, 2023 16:56
update test api version check
aea2db0 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
add nosec directives
a54812b 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
fix typo
be2d360 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
go mod tidy
1889f39 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
merge main
5cb776c 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
dataclouder
dataclouder reviewed Aug 28, 2023
View reviewed changes
website/docs/r/vapp_vm.html.markdown Outdated Show resolved Hide resolved
website/docs/r/vapp_vm.html.markdown Outdated Show resolved Hide resolved
website/docs/r/vapp_vm.html.markdown Outdated Show resolved Hide resolved
Didainius
Didainius reviewed Aug 30, 2023
View reviewed changes
Copy link
Collaborator

@Didainius Didainius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My first scan through with some questions

website/docs/r/vapp_vm.html.markdown Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
website/docs/r/vapp_vm.html.markdown Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Show resolved Hide resolved
vcd/resource_vcd_vapp_vm_boot_options_test.go Outdated Show resolved Hide resolved
Adam Jasinski added 6 commits August 30, 2023 15:51
address comments
6ba329c 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
merge main
3282270 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
add explicit Refresh() call
9b5a70b 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
update govcd
6d2952e 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
fix vapp not found
b84bfa8 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
fix AdvancedCompute errors
a4c541a 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
Didainius
Didainius reviewed Sep 5, 2023
View reviewed changes
.changes/v3.11.0/1109-features.md Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
Move Boot Options change out of powered-off VM changes,
4e55832 
Also check for the values to exist using GetOk instead of Get

Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
Adam Jasinski added 4 commits September 6, 2023 18:35
Now EnterBiosSetup doesn't get set on PowerOn of the VM,
8c5e1e4 
which results in an inconsistent plan but is more convenient for the user as it
doesn't result in a BIOS loop

Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
Return an additional warning if enter_bios_setup is set to true.
3e4a347 
Update documentation's  'bios' to `bios`.

Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
Fix efi_secure_boot not being set if firmware is not changed
bf450c8 
Update website
Make tests work because of inconsistent plan
Rename 'enter_bios_setup' to 'enter_bios_setup_on_next_boot'

Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
fix tests that were failing
1c2628a 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
Adam Jasinski added 3 commits September 11, 2023 10:58
change enter_bios_setup in test step2 to false
e4b2e08 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
add boot options tests for all four types of VMs
7efa672 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
Add destroychecks
c5c15ab 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
Didainius
Didainius reviewed Sep 12, 2023
View reviewed changes
website/docs/r/vapp_vm.html.markdown Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
Adam Jasinski added 5 commits September 12, 2023 08:29
fix tags
6ec7fc3 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
address comments
8b8ff82 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
merge main
019a9e5 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
fix read for standalone vm
aa19519 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
add doc about vm poweroff/poweron fields
c309632 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
lvirbalas
lvirbalas requested changes Sep 12, 2023
View reviewed changes
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Show resolved Hide resolved
address comments regarding wording in descriptions and error messages
95e0591 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
Didainius
Didainius approved these changes Sep 13, 2023
View reviewed changes
Copy link
Collaborator

@Didainius Didainius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for all the improvements. I have a left a few more comments to address

vcd/resource_vcd_vapp_vm_boot_options_test.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Show resolved Hide resolved
move versioncheck to the top for the test, add skip-upgrade-tests dir…
21ac766 
…ective for vapp_vm and vm

Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
lvirbalas
lvirbalas approved these changes Sep 13, 2023
View reviewed changes
Copy link
Collaborator

@lvirbalas lvirbalas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the updates! One more approval into the basket :)

Adam Jasinski added 2 commits September 13, 2023 13:31
Check if len(diags) == 0
0759426 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
Change len(diags) == nil to len(diags) != nil
23cb10f 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
dataclouder
dataclouder reviewed Sep 13, 2023
View reviewed changes
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm.go Show resolved Hide resolved
vcd/resource_vcd_vapp_vm_boot_options_test.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm_boot_options_test.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm_boot_options_test.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm_boot_options_test.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm_boot_options_test.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm_boot_options_test.go Outdated Show resolved Hide resolved
vcd/resource_vcd_vapp_vm_boot_options_test.go Outdated Show resolved Hide resolved
Adam Jasinski added 2 commits September 13, 2023 14:48
format .tf constants
14151a7 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
delete unused variables, improve some error messages
cdaf748 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
adambarreiro
adambarreiro approved these changes Sep 14, 2023
View reviewed changes
Copy link
Collaborator

@adambarreiro adambarreiro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for this feature 👍

update govcd
dc77026 
Signed-off-by: Adam Jasinski <jasinskia@vmware.com>
@adezxc adezxc merged commit b24e101 into vmware:main Sep 14, 2023
3 checks passed
@adezxc adezxc deleted the vm-boot-options branch September 14, 2023 18:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Didainius Didainius Didainius approved these changes

@dataclouder dataclouder dataclouder approved these changes

@lvirbalas lvirbalas lvirbalas approved these changes

@adambarreiro adambarreiro adambarreiro approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add option to specify boot firmware (BIOS/EFI) and secure boot
5 participants
@adezxc @adambarreiro @lvirbalas @dataclouder @Didainius