cloud.cfg.tmpl: reorganise, minimise/reduce duplication

[dermotbradley]

Proposed Commit Message

cloud.cfg.tmpl: reorganise, minimise/reduce duplication

Simplify the cloud.cfg.tmpl file. There is a lot of duplication (e.g.
the same sudo rule specified multiple times).

This also addresses #4267 and aligns Debian-specific template
configuration with Debian's own packaged cloud.cfg, located here:
https://salsa.debian.org/cloud-team/cloud-init/-/blob/master/debian/cloud.cfg

Fixes GH-4267

Additional Context

Test Steps

Checklist:

• My code follows the process laid out in the documentation
• I have updated or added any unit tests accordingly
• I have updated or added any documentation accordingly

[igalic]

👀

[TheRealFalcon]

Good work here. I have a couple thoughts inline that I think we should figure out before we go any further.

[TheRealFalcon]

Bah...I had left another comment yesterday that seems to have disappeared. Sorry about that. It was the main thing I was wondering about so I recreated it here.

[dermotbradley]

I made some more changes including tidying up multiple blank lines, making YAML indentation uniform.

I used tools/render-cloudcfg to compare all the distros it supports "before" and "after" and things look good.

I notice that render-cloudcfg does not permit some distros as valid parameters though. Should "dragonfly", "cos", and the various Suse variations be valid options for that script?

[dermotbradley]

BTW I happened to notice that for variant "amazon" there is no module enabled in cloud_config_modules section for (RPM) packages, e.g yum_add_repo.

This is not something I've broken, I checked the rendered version of the existing cloud.cfg.tmpl and it is the same situation.

I assume therefore that AWS must be modifying or replacing the cloud.cfg when they package cloud-init for AWS Linux.

[TheRealFalcon]

This is looking really good. Thanks @dermotbradley

I notice that render-cloudcfg does not permit some distros as valid parameters though. Should "dragonfly", "cos", and the various Suse variations be valid options for that script?

Let's add dragonfly as that is specifically called out in the template, but I think we can leave the others.

I left a few small nits inline. Beyond that:

For Alpine, I noticed a few non-trivial changes. I'm assuming those are intentional? In particular, groups changed from [adm, sudo] to [adm, wheel]. Also, there's an added eni network renderer when there was none before.

For Debian, I don't think the added renderers/activators are correct. Bookworm cloud images are shipping with netplan and systemd-networkd by default. I would expect a list similar to Ubuntu.

[TheRealFalcon]

I left a few small nits inline

Here's the inline comments.

[dermotbradley]

Let's add dragonfly as that is specifically called out in the template, but I think we can leave the others.

Ok, I'll do that.

For Alpine, I noticed a few non-trivial changes. I'm assuming those are intentional? In particular, groups changed from [adm, sudo] to [adm, wheel]. Also, there's an added eni network renderer when there was none before.

Yes these are intentional.

For Debian, I don't think the added renderers/activators are correct. Bookworm cloud images are shipping with netplan and systemd-networkd by default. I would expect a list similar to Ubuntu.

I wasn't sure what these should be and so assumed only 'eni' (for older Debian releases) and 'networkd' as newer releases seemed to use that. Didn't realise Debian used/supported netplan.

I'll change this as you indicated.

[TheRealFalcon]

LGTM!

Final thing is this branch needs a rebase. There's a conflict (I believe due to openeuler changing case).

[igalic]

👍

[dermotbradley]

Final thing is this branch needs a rebase. There's a conflict (I believe due to openeuler changing case).

Done.

[TheRealFalcon]

Thanks!