fix(cloud-init): update cloud-init to correctly support azl4#16938
Conversation
There was a problem hiding this comment.
Pull request overview
Updates the cloud-init component packaging for Azure Linux 4 by ensuring the rendered templates/configs are generated with an azurelinux variant and by patching upstream templates to recognize that variant.
Changes:
- Add a patch to include
azurelinuxin cloud-init’s systemd unit/generator templates. - Add a patch to adjust
cloud.cfgtemplate behavior forazurelinux(including default user handling) and update the related unit test. - Update
cloud-init.comp.tomloverlays to apply the new patches and to replace the spec’srender-template --variant ...invocation with--variant azurelinux.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| base/comps/cloud-init/cloud-init.comp.toml | Adds new Patch/file overlays and changes the spec search/replace to force --variant azurelinux. |
| base/comps/cloud-init/add-azurelinux-to-systemd-templates.patch | Extends systemd template conditionals to treat azurelinux like Fedora/RHEL-family variants where appropriate. |
| base/comps/cloud-init/update-cloud-cfg.patch | Adjusts cloud.cfg template logic for azurelinux and updates an upstream unit test expectation. |
|
converting to draft temporarily, so i can get real patches set up in a branch on a forked cloud-init repo. |
c199738 to
e7bc499
Compare
4024b55 to
adf08b0
Compare
63ae5f2 to
94241ac
Compare
|
this is ready for review/merging. note that the upstream pr has not yet been merged, but getting this in is time-sensitive, and we can adjust if needed once the upstream pr is merged. |
…nux.patch The description describes the cpe parsing as invalid, but it's actually just a newer cpe format.
Set the %py3_install --distro parameter to azurelinux instead of fedora. Also move the overlay to after the addition of upstream patches.
6e86174 to
052f3a7
Compare
Update the build to pass the variant 'azurelinux' as well as applying multiple patches from upstream PR canonical/cloud-init#6874.
|
updated to keep the |
This modifies the spec file to pass the variant as 'azurelinux', as well as applying patches from upstream PR canonical/cloud-init#6874
Fixes: AB#18738