Backport of customizations to RHEL8 #740
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
The goal here is to do the minimum needed to get the images setup for use so they can have more complex customizations applied later. I think this list is a pretty good minimal set of features without going full kickstart. (cherry picked from commit 95c288d) Related: rhbz#1709595
For example: [customizations.timezone] timezone = "US/Samoa" ntpservers = ["0.pool.ntp.org"] Also includes tests. This removes the timezone kickstart command from all of the templates except for google.ks which needs to set it's own ntp servers and timezone. If timezone isn't included in the blueprint, and it is not already in a template, it will be set to 'timezone UTC' by default. If timezone is set in a template it is left as-is, under the assumption that the image type requires it to boot correctly. (cherry picked from commit 9bdbb29) Related: rhbz#1709595
(cherry picked from commit 2929dea) Related: rhbz#1709595
This fixes the customizations list problem earlier than in add_customizations. In the recipe it should be [customizations] not [[customizations]] which creates a list. If it was used that way grab the first element and replace the list with it. (cherry picked from commit 67007df) Related: rhbz#1709595
You can now set the keyboard layout and language. Eg. [customizations.locale] languages = ["en_CA.utf8", "en_HK.utf8"] keyboard = "de (dvorak)" Existing entries in the kickstart templates are replaced with the new ones. If there are no entries then it will default to 'keyboard us' and 'lang en_US.UTF-8' Includes tests, and leaves the existing keyboard and lang entries in the templates with a note that they can be replaced by the blueprint. (cherry picked from commit e5a8700) Related: rhbz#1709595
You can now open ports in the firewall, using port numbers or service
names:
[customizations.firewall]
ports = ["22:tcp", "80:tcp", "imap:tcp", "53:tcp", "53:udp"]
Or enable/disable services registered with firewalld:
[customizations.firewall.services]
enabled = ["ftp", "ntp", "dhcp"]
disabled = ["telnet"]
If the template contains firewall --disabled it cannot be overridden,
under the assumption that it is required for the image to boot in the
selected environment.
(cherry picked from commit 4d35668)
Related: rhbz#1709595
Add support for enabling and disabling systemd services in the
blueprint. It works like this:
[customizations.services]
enabled = ["sshd", "cockpit.socket", "httpd"]
disabled = ["postfix", "telnetd"]
They are *added* to any existing settings in the kickstart templates.
(cherry picked from commit 1111aee)
Related: rhbz#1709595
Make it clear that the services are added to services already listed in the image templates, and that you can specify any systemd unit filename. Older releases are more restrictive, and this documentation will need to be updated when these changes are backported. (cherry picked from commit 4f701e7) Related: rhbz#1709595
To maintain consistency with the other options this changes firewall to combine the existing settings from the image template with the settings from the blueprint. Also updated the docs, added a new test for it, and sorted the output for consistency. (cherry picked from commit 3e08389) Resolves: rhbz#1709595
(cherry picked from commit 9724731) Related: rhbz#1709595
This also includes extensive tests for each of the currently supported customizations. It should be generic enough to continue working as long as the list of dicts includes a 'name' or 'user' field in the dict. Otherwise support for a new dict key will need to be added to the customizations_diff function. (cherry picked from commit 850c490) Related: rhbz#1709595
composer-cli will now output information about changes to customizations entries and the repos.git entries. (cherry picked from commit 156ef0a) Related: rhbz#1709595
Pull Request Test Coverage Report for Build 1688
💛 - Coveralls |
Support is not included in this patchset. Related: rhbz#1709595
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.
--- Merge policy ---
*-aws-runtestPASS*-azure-runtestPASS*-images-runtestPASS*-openstack-runtestPASS*-vmware-runtestPASSrhel8-*andrhel7-*branches commit log references an approvedbug in Bugzilla. Do not merge if the bug doesn't have the 3 ACKs set to
+!--- Jenkins commands ---
ok to testto accept this pull request for testingtest this pleasefor a one time test runretest this pleaseto start a new build