Merge upstream 2021-06-25 #161
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
I've spotted a few errors with the configdrive handling: * We forgot to add configdrive to 'deploy failed' handler, so a repeated deployment will always happen without a configdrive. * ConfigDrive creation is conditional on UserData presence. This is incorrect, any field being populated should trigger configdrive. * There was no check on empty networkData, so we always tried to deserialize empty string with YAML (which works, but is incorrect). Create a new helper for configdrive, fix inline comments and cover configdrive creation with unit tests.
During provisioning, we want an error to cause the Host to be deprovisioned again, but we very much do not want that to happen when the Host is already provisioned. Due to an error in 0a7713b, provisioned Hosts were being automatically deprovisioned whenever an error (other than a registration error) occurred. In practice this only manifested on Adopt() failures, since we don't yet report power management failures. Fixes metal3-io#915
Don't deprovision provisioned host due to error
Fix configdrive handling
Signed-off-by: Hu Shuai <hus.fnst@cn.fujitsu.com>
Signed-off-by: Zou Yu <zouy.fnst@cn.fujitsu.com>
Adding BIOS Parameters in api.md
Fix some typos in comments
openshift-ci
bot
added
the
approved
|
/lgtm Thanks @honza ! |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: honza, sadasu The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.