Merge upstream 2020-12-04 #114
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
If an existing Ironic node, and a BMH share a MAC address, link them together.
This adds a new `manifest-lint` target in the Makefile to run manifest validation checks via ./hack/manifestlint.sh script.
Add a Makefile target for running manifest validation
Look up existing nodes by MAC address
It is not safe to assume in ValidateManagementAccess() that the ironic state will eventually converge to manageable, available, or active. The state may in fact be something (like e.g. adopt failed) that requires action on the part of the actual provisioning function for the current state to resolve. We previously weren't allowing that, because ValidateManagementAccess() was always forcing a requeue whenever it encountered a node in another state. Since b7b10d7 we call ValidateManagementAccess() in substantially every provisioning state, so there are even more node states (e.g. inspect failed) that we could get stuck in. Move the code for handling the verifying state so that it runs only in that state, and allow all other states from manageable on to be handled by the host state machine.
Test that ValidateManagementAccess() requeues when the node is in the Enroll or Validating states.
Avoid getting stuck in ValidateManagementAccess due to node state
openshift-ci-robot
added
the
approved
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: dhellmann, zaneb 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.