fix(rhel): Fix network ordering in sysconfig

NM_CONTROLLED=true allows cloud-init to wait until network devices are online.
canonical · Mar 26, 2024 · 9a7674a · 9a7674a
1 parent 9753749
commit 9a7674a
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 67 deletions.
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
@@ -317,7 +317,6 @@ class Renderer(renderer.Renderer):
  "rhel": {
  "ONBOOT": True,
  "USERCTL": False,
- "NM_CONTROLLED": False,
  "BOOTPROTO": "none",
  },
  "suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},

diff --git a/doc/rtd/reference/network-config.rst b/doc/rtd/reference/network-config.rst
@@ -308,15 +308,13 @@ Example output:
  BOOTPROTO=static
  DEVICE=eth7
  IPADDR=192.168.1.5/255.255.255.0
- NM_CONTROLLED=no
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
  # Created by cloud-init automatically, do not edit.
  #
  BOOTPROTO=dhcp
  DEVICE=eth9
- NM_CONTROLLED=no
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no

diff --git a/tests/unittests/cmd/devel/test_net_convert.py b/tests/unittests/cmd/devel/test_net_convert.py
@@ -62,7 +62,6 @@
 #
 BOOTPROTO=dhcp
 DEVICE=eth0
-NM_CONTROLLED=no
 ONBOOT=yes
 TYPE=Ethernet
 USERCTL=no

diff --git a/tests/unittests/distros/test_netconfig.py b/tests/unittests/distros/test_netconfig.py
@@ -723,7 +723,6 @@ def test_apply_network_config_rh(self):
  GATEWAY=192.168.1.254
  IPADDR=192.168.1.5
  NETMASK=255.255.255.0
- NM_CONTROLLED=no
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
@@ -733,7 +732,6 @@ def test_apply_network_config_rh(self):
  """\
  BOOTPROTO=dhcp
  DEVICE=eth1
- NM_CONTROLLED=no
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
@@ -764,7 +762,6 @@ def test_apply_network_config_ipv6_rh(self):
  IPV6_AUTOCONF=no
  IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
  IPV6_FORCE_ACCEPT_RA=no
- NM_CONTROLLED=no
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
@@ -774,7 +771,6 @@ def test_apply_network_config_ipv6_rh(self):
  """\
  BOOTPROTO=dhcp
  DEVICE=eth1
- NM_CONTROLLED=no
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
@@ -821,7 +817,6 @@ def test_vlan_render_unsupported(self):
  HWADDR=00:16:3e:60:7c:df
  IPADDR=192.10.1.2
  NETMASK=255.255.255.0
- NM_CONTROLLED=no
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
@@ -833,7 +828,6 @@ def test_vlan_render_unsupported(self):
  DEVICE=infra0
  IPADDR=10.0.1.2
  NETMASK=255.255.0.0
- NM_CONTROLLED=no
  ONBOOT=yes
  PHYSDEV=eth0
  USERCTL=no
@@ -869,7 +863,6 @@ def test_vlan_render(self):
  DEVICE=eth0
  IPADDR=192.10.1.2
  NETMASK=255.255.255.0
- NM_CONTROLLED=no
  ONBOOT=yes
  TYPE=Ethernet
  USERCTL=no
@@ -881,7 +874,6 @@ def test_vlan_render(self):
  DEVICE=eth0.1001
  IPADDR=10.0.1.2
  NETMASK=255.255.0.0
- NM_CONTROLLED=no
  ONBOOT=yes
  PHYSDEV=eth0
  USERCTL=no