Skip to content

Rebase c10s to version 24.1.4 and apply downstream patches

Ani Sinha requested to merge anisinha/cloud-init:c10s-24.1.2 into c10s

Jira: https://issues.redhat.com/browse/RHEL-33439

This MR does the following things:

  • Rebases cloud-init in c10s to version 24.1.4 from upstream. This is pristine upstream source with no downstream changes.
  • Applies downstream only fixes from c9s. The changes that required to be done to downstream fixes are described in the commit messages for the corresponding changes.
  • Backports two patches that we need from upstream in c10s. These patches were committed after release of 24.1.2 and not backported to 24.1 train. They are
    • Give nm renderer higher priority over sysconfig renderer. This makes nm renderer the default renderer for c10s. We had plans for doing this all along. The patch subject is feat: Use NetworkManager renderer by default in RHEL family
    • Remove NM_CONTROLLED=no from sysconfig files. We were already doing this in downstream. The upstream patch makes things simpler downstream. The patch subject is fix(rhel): Fix network ordering in sysconfig.
  • Applies a small fix in the downstream Makefile that makes the patch application work in my dev environment.

QE has performed some basic testing and seems basic functions work well. More rigorous testing will be performed when c10s image is available.

Edited by Miroslav Rezanina

Merge request reports