Skip to content

Commit

Permalink
fix(rhel): Fix network ordering in upstream cloud-init
Browse files Browse the repository at this point in the history
1. NM_CONTROLLED=true should be set to allow cloud-init to wait until network
   devices are online.
2. RHEL derivatives should be using the NetworkManager renderer, so set that
   in the default config.
  • Loading branch information
holmanb committed Mar 22, 2024
1 parent 1dfffd0 commit 9ad46e2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion cloudinit/net/sysconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,6 @@ class Renderer(renderer.Renderer):
"rhel": {
"ONBOOT": True,
"USERCTL": False,
"NM_CONTROLLED": False,
"BOOTPROTO": "none",
},
"suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
Expand Down
2 changes: 1 addition & 1 deletion config/cloud.cfg.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ system_info:
activators: ['netplan', 'eni', 'network-manager', 'networkd']
{% elif is_rhel %}
network:
renderers: ['sysconfig', 'eni', 'netplan', 'network-manager', 'networkd']
renderers: ['eni', 'netplan', 'network-manager', 'sysconfig', 'networkd']
{% endif %}
{% if variant == "photon" %}
# If set to true, cloud-init will not use fallback network config.
Expand Down

0 comments on commit 9ad46e2

Please sign in to comment.