Synchronise 2024.1 with upstream #18
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
The amphora image builds are currently failing because we are trying to install the binary packages for diskimage-builder ourselves in the ansible for the job. This patch changes that to use the bindep.txt included with diskimage-builder. Change-Id: I8e489b251ff0e58809b66c0145023769abef6e68 (cherry picked from commit d682e74) (cherry picked from commit 9cfdc84cb16968eadfc99bbf9ea22f147e355aca)
Prevent AttributeError when protocol field is None and skip processing of the rule instead. Closes-Bug: #2086768 Change-Id: I35e96fdd2c28a005811d6fdedb570ccc65e30e0a (cherry picked from commit 430854c)
When building rockylinux images, DIB install the Minimal Install group which pulls firewalld. By default it allows only SSH traffic, so we would need specific rules for the management and tenant traffic, but as we are using security groups, it's safe to remove firewalld. Change-Id: I87a26faf6c72640d8916bc3452123a9b5a74d39f (cherry picked from commit e8fd3b7)
... on Rocky 9 during DIB build. 2024-05-29 14:06:50.789 | > Error: 2024-05-29 14:06:50.789 | > Problem: problem with installed package curl-7.76.1-29.el9_4.x86_64 2024-05-29 14:06:50.789 | > - package curl-minimal-7.76.1-29.el9_4.x86_64 from baseos conflicts with curl provided by curl-7.76.1-29.el9_4.x86_64 from @System 2024-05-29 14:06:50.789 | > - package curl-minimal-7.76.1-29.el9_4.x86_64 from baseos conflicts with curl provided by curl-7.76.1-29.el9_4.x86_64 from baseos 2024-05-29 14:06:50.789 | > - conflicting requests 2024-05-29 14:06:50.789 | > (try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages or '--nobest' to use not only best candidate packages) 2024-05-29 14:06:50.789 | returncode: 1 2024-05-29 14:06:50.789 | install-packages failed with returncode 1 Change-Id: I444293e0d6fcf125d2c3b12144bdf92c00f49dce (cherry picked from commit 5c0b011)
…tly" into stable/2024.1
priteau
approved these changes
Nov 25, 2024
priteau
approved these changes
Nov 25, 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.
This PR contains a snapshot of 2024.1 from upstream stable/2024.1.