Cherry picks for Foreman 3.11.2 #10304
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
FFI 1.17 needs rubygems 3.3.22+, which is Ruby 3.0+ only (cherry picked from commit f2e6bca)
Moving it to a different file alphabetically after seeds.rb makes the callback finalizing plugin end up being put after the callback that does the seeding. (cherry picked from commit b5638c7)
Currently when entering an invalid MAC address while editing a host's interface, the message shown is: "'fa:16:3e:17:3e:19x' is not a valid MAC address and is not a valid MAC address" This is because before the validation itself, another method Net::Validations::normalize_mac is called, which also raises an error upon finding a MAC address invalid (foreman/app/models/nic/base.rb). Since I found the method normalize_mac being used at multiple places, I did not want to alter the behavior of this method. Validation through the MacAddressValidator seems to be used only once, so I deemed more proper to edit the method there. Still, I am not certain if the two methods are equivalent as far as validation goes, so I just added a condition which prevents duplicating the error message if normalize_mac already threw an error. (cherry picked from commit 38fae6e)
(cherry picked from commit 6aac916)
The sequences can be so large that the resulting IP is outside of the subnet. That causes tests to fail. It now determines the available IPs within the subnet and uses modulo to stay within that. (cherry picked from commit 451ebb1)
(cherry picked from commit 19b2129)
When having a domain with a .ics extension we get a ActionView::MissingTemplate: Missing template react/index error. This PR change forces the react controller to use the HTML format. With this change the host is able to be loaded in the UI. (cherry picked from commit 44160c0)
pr-processor
bot
added
Not yet reviewed
Stable branch
|
The RHEL 9 build looks unrelated: |
evgeni
approved these changes
Sep 3, 2024
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.
I went through the changes since 3.11 branches and think that these are all relevant picks.