|
 |
59e311 |
From c521ec2ce5b1d9a7322ce152011b8792f121bf5c Mon Sep 17 00:00:00 2001
|
|
|
c36ff1 |
From: Eduardo Otubo <otubo@redhat.com>
|
|
|
c36ff1 |
Date: Fri, 7 May 2021 13:36:06 +0200
|
|
|
c36ff1 |
Subject: Do not write NM_CONTROLLED=no in generated interface config files
|
|
|
c36ff1 |
|
|
|
c36ff1 |
Conflicts 20.3:
|
|
|
c36ff1 |
- Not appplying patch on cloudinit/net/sysconfig.py since it now has a
|
|
|
c36ff1 |
mechanism to identify if cloud-init is running on RHEL, having the
|
|
|
c36ff1 |
correct settings for NM_CONTROLLED.
|
|
|
c36ff1 |
|
|
|
c36ff1 |
Merged patches (21.1):
|
|
|
c36ff1 |
- ecbace48 sysconfig: Don't write BOOTPROTO=dhcp for ipv6 dhcp
|
|
|
c36ff1 |
- a1a00383 include 'NOZEROCONF=yes' in /etc/sysconfig/network
|
|
|
c36ff1 |
X-downstream-only: true
|
|
|
c36ff1 |
Signed-off-by: Eduardo Otubo <otubo@redhat.com>
|
|
|
c36ff1 |
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
|
|
|
c36ff1 |
---
|
|
|
59e311 |
cloudinit/net/sysconfig.py | 12 ++++++++++--
|
|
|
c36ff1 |
tests/unittests/test_net.py | 28 ----------------------------
|
|
|
59e311 |
2 files changed, 10 insertions(+), 30 deletions(-)
|
|
|
c36ff1 |
|
|
|
c36ff1 |
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
|
|
|
59e311 |
index ba85c4f6..d8c53312 100644
|
|
|
c36ff1 |
--- a/cloudinit/net/sysconfig.py
|
|
|
c36ff1 |
+++ b/cloudinit/net/sysconfig.py
|
|
|
59e311 |
@@ -336,7 +336,6 @@ class Renderer(renderer.Renderer):
|
|
|
59e311 |
"rhel": {
|
|
|
59e311 |
"ONBOOT": True,
|
|
|
59e311 |
"USERCTL": False,
|
|
|
59e311 |
- "NM_CONTROLLED": False,
|
|
|
59e311 |
"BOOTPROTO": "none",
|
|
|
59e311 |
},
|
|
|
59e311 |
"suse": {"BOOTPROTO": "static", "STARTMODE": "auto"},
|
|
|
59e311 |
@@ -1039,7 +1038,16 @@ class Renderer(renderer.Renderer):
|
|
|
c36ff1 |
# Distros configuring /etc/sysconfig/network as a file e.g. Centos
|
|
|
59e311 |
if sysconfig_path.endswith("network"):
|
|
|
c36ff1 |
util.ensure_dir(os.path.dirname(sysconfig_path))
|
|
|
59e311 |
- netcfg = [_make_header(), "NETWORKING=yes"]
|
|
|
c36ff1 |
+ netcfg = []
|
|
|
c36ff1 |
+ for line in util.load_file(sysconfig_path, quiet=True).split('\n'):
|
|
|
c36ff1 |
+ if 'cloud-init' in line:
|
|
|
c36ff1 |
+ break
|
|
|
c36ff1 |
+ if not line.startswith(('NETWORKING=',
|
|
|
c36ff1 |
+ 'IPV6_AUTOCONF=',
|
|
|
c36ff1 |
+ 'NETWORKING_IPV6=')):
|
|
|
c36ff1 |
+ netcfg.append(line)
|
|
|
c36ff1 |
+ # Now generate the cloud-init portion of sysconfig/network
|
|
|
c36ff1 |
+ netcfg.extend([_make_header(), 'NETWORKING=yes'])
|
|
|
c36ff1 |
if network_state.use_ipv6:
|
|
|
59e311 |
netcfg.append("NETWORKING_IPV6=yes")
|
|
|
59e311 |
netcfg.append("IPV6_AUTOCONF=no")
|
|
|
c36ff1 |
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
|
|
|
59e311 |
index 47e4ba00..591241b3 100644
|
|
|
c36ff1 |
--- a/tests/unittests/test_net.py
|
|
|
c36ff1 |
+++ b/tests/unittests/test_net.py
|
|
|
59e311 |
@@ -579,7 +579,6 @@ GATEWAY=172.19.3.254
|
|
|
c36ff1 |
HWADDR=fa:16:3e:ed:9a:59
|
|
|
c36ff1 |
IPADDR=172.19.1.34
|
|
|
c36ff1 |
NETMASK=255.255.252.0
|
|
|
c36ff1 |
-NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
c36ff1 |
USERCTL=no
|
|
|
59e311 |
@@ -712,7 +711,6 @@ IPADDR=172.19.1.34
|
|
|
c36ff1 |
IPADDR1=10.0.0.10
|
|
|
c36ff1 |
NETMASK=255.255.252.0
|
|
|
c36ff1 |
NETMASK1=255.255.255.0
|
|
|
c36ff1 |
-NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
c36ff1 |
USERCTL=no
|
|
|
59e311 |
@@ -874,7 +872,6 @@ IPV6_AUTOCONF=no
|
|
|
c36ff1 |
IPV6_DEFAULTGW=2001:DB8::1
|
|
|
c36ff1 |
IPV6_FORCE_ACCEPT_RA=no
|
|
|
c36ff1 |
NETMASK=255.255.252.0
|
|
|
c36ff1 |
-NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
c36ff1 |
USERCTL=no
|
|
|
59e311 |
@@ -1053,7 +1050,6 @@ NETWORK_CONFIGS = {
|
|
|
c36ff1 |
BOOTPROTO=none
|
|
|
c36ff1 |
DEVICE=eth1
|
|
|
c36ff1 |
HWADDR=cf:d6:af:48:e8:80
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
59e311 |
USERCTL=no"""
|
|
|
59e311 |
@@ -1072,7 +1068,6 @@ NETWORK_CONFIGS = {
|
|
|
c36ff1 |
IPADDR=192.168.21.3
|
|
|
c36ff1 |
NETMASK=255.255.255.0
|
|
|
c36ff1 |
METRIC=10000
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
59e311 |
USERCTL=no"""
|
|
|
59e311 |
@@ -1244,7 +1239,6 @@ NETWORK_CONFIGS = {
|
|
|
c36ff1 |
IPV6_AUTOCONF=no
|
|
|
c36ff1 |
IPV6_FORCE_ACCEPT_RA=no
|
|
|
c36ff1 |
NETMASK=255.255.255.0
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
c36ff1 |
USERCTL=no
|
|
|
59e311 |
@@ -2093,7 +2087,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
|
c36ff1 |
DHCPV6C=yes
|
|
|
c36ff1 |
IPV6INIT=yes
|
|
|
c36ff1 |
MACADDR=aa:bb:cc:dd:ee:ff
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Bond
|
|
|
59e311 |
USERCTL=no"""
|
|
|
59e311 |
@@ -2103,7 +2096,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
|
c36ff1 |
BOOTPROTO=dhcp
|
|
|
c36ff1 |
DEVICE=bond0.200
|
|
|
c36ff1 |
DHCLIENT_SET_DEFAULT_ROUTE=no
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
PHYSDEV=bond0
|
|
|
c36ff1 |
USERCTL=no
|
|
|
59e311 |
@@ -2123,7 +2115,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
|
c36ff1 |
IPV6_DEFAULTGW=2001:4800:78ff:1b::1
|
|
|
c36ff1 |
MACADDR=bb:bb:bb:bb:bb:aa
|
|
|
c36ff1 |
NETMASK=255.255.255.0
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
PRIO=22
|
|
|
c36ff1 |
STP=no
|
|
|
59e311 |
@@ -2135,7 +2126,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
|
c36ff1 |
BOOTPROTO=none
|
|
|
c36ff1 |
DEVICE=eth0
|
|
|
c36ff1 |
HWADDR=c0:d6:9f:2c:e8:80
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
59e311 |
USERCTL=no"""
|
|
|
59e311 |
@@ -2154,7 +2144,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
|
c36ff1 |
MTU=1500
|
|
|
c36ff1 |
NETMASK=255.255.255.0
|
|
|
c36ff1 |
NETMASK1=255.255.255.0
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
PHYSDEV=eth0
|
|
|
c36ff1 |
USERCTL=no
|
|
|
59e311 |
@@ -2166,7 +2155,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
|
c36ff1 |
DEVICE=eth1
|
|
|
c36ff1 |
HWADDR=aa:d6:9f:2c:e8:80
|
|
|
c36ff1 |
MASTER=bond0
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
SLAVE=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
59e311 |
@@ -2178,7 +2166,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
|
c36ff1 |
DEVICE=eth2
|
|
|
c36ff1 |
HWADDR=c0:bb:9f:2c:e8:80
|
|
|
c36ff1 |
MASTER=bond0
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
SLAVE=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
59e311 |
@@ -2190,7 +2177,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
|
c36ff1 |
BRIDGE=br0
|
|
|
c36ff1 |
DEVICE=eth3
|
|
|
c36ff1 |
HWADDR=66:bb:9f:2c:e8:80
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
59e311 |
USERCTL=no"""
|
|
|
59e311 |
@@ -2201,7 +2187,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
|
c36ff1 |
BRIDGE=br0
|
|
|
c36ff1 |
DEVICE=eth4
|
|
|
c36ff1 |
HWADDR=98:bb:9f:2c:e8:80
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
59e311 |
USERCTL=no"""
|
|
|
59e311 |
@@ -2212,7 +2197,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
|
|
|
c36ff1 |
DEVICE=eth5
|
|
|
c36ff1 |
DHCLIENT_SET_DEFAULT_ROUTE=no
|
|
|
c36ff1 |
HWADDR=98:bb:9f:2c:e8:8a
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=no
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
59e311 |
USERCTL=no"""
|
|
|
59e311 |
@@ -2689,7 +2673,6 @@ iface bond0 inet6 static
|
|
|
c36ff1 |
MTU=9000
|
|
|
c36ff1 |
NETMASK=255.255.255.0
|
|
|
c36ff1 |
NETMASK1=255.255.255.0
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Bond
|
|
|
c36ff1 |
USERCTL=no
|
|
|
59e311 |
@@ -2701,7 +2684,6 @@ iface bond0 inet6 static
|
|
|
c36ff1 |
DEVICE=bond0s0
|
|
|
c36ff1 |
HWADDR=aa:bb:cc:dd:e8:00
|
|
|
c36ff1 |
MASTER=bond0
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
SLAVE=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
59e311 |
@@ -2729,7 +2711,6 @@ iface bond0 inet6 static
|
|
|
c36ff1 |
DEVICE=bond0s1
|
|
|
c36ff1 |
HWADDR=aa:bb:cc:dd:e8:01
|
|
|
c36ff1 |
MASTER=bond0
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
SLAVE=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
59e311 |
@@ -2794,7 +2775,6 @@ iface bond0 inet6 static
|
|
|
c36ff1 |
BOOTPROTO=none
|
|
|
c36ff1 |
DEVICE=en0
|
|
|
c36ff1 |
HWADDR=aa:bb:cc:dd:e8:00
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
59e311 |
USERCTL=no"""
|
|
|
59e311 |
@@ -2815,7 +2795,6 @@ iface bond0 inet6 static
|
|
|
c36ff1 |
MTU=2222
|
|
|
c36ff1 |
NETMASK=255.255.255.0
|
|
|
c36ff1 |
NETMASK1=255.255.255.0
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
PHYSDEV=en0
|
|
|
c36ff1 |
USERCTL=no
|
|
|
59e311 |
@@ -2890,7 +2869,6 @@ iface bond0 inet6 static
|
|
|
c36ff1 |
DEVICE=br0
|
|
|
c36ff1 |
IPADDR=192.168.2.2
|
|
|
c36ff1 |
NETMASK=255.255.255.0
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
PRIO=22
|
|
|
c36ff1 |
STP=no
|
|
|
59e311 |
@@ -3032,7 +3010,6 @@ iface bond0 inet6 static
|
|
|
c36ff1 |
HWADDR=52:54:00:12:34:00
|
|
|
c36ff1 |
IPADDR=192.168.1.2
|
|
|
c36ff1 |
NETMASK=255.255.255.0
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=no
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
c36ff1 |
USERCTL=no
|
|
|
59e311 |
@@ -3044,7 +3021,6 @@ iface bond0 inet6 static
|
|
|
c36ff1 |
DEVICE=eth1
|
|
|
c36ff1 |
HWADDR=52:54:00:12:34:aa
|
|
|
c36ff1 |
MTU=1480
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
c36ff1 |
USERCTL=no
|
|
|
59e311 |
@@ -3055,7 +3031,6 @@ iface bond0 inet6 static
|
|
|
c36ff1 |
BOOTPROTO=none
|
|
|
c36ff1 |
DEVICE=eth2
|
|
|
c36ff1 |
HWADDR=52:54:00:12:34:ff
|
|
|
c36ff1 |
- NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=no
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
c36ff1 |
USERCTL=no
|
|
|
59e311 |
@@ -3628,7 +3603,6 @@ class TestRhelSysConfigRendering(CiTestCase):
|
|
|
c36ff1 |
BOOTPROTO=dhcp
|
|
|
c36ff1 |
DEVICE=eth1000
|
|
|
c36ff1 |
HWADDR=07-1c-c6-75-a4-be
|
|
|
c36ff1 |
-NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
c36ff1 |
USERCTL=no
|
|
|
59e311 |
@@ -3840,7 +3814,6 @@ GATEWAY=10.0.2.2
|
|
|
c36ff1 |
HWADDR=52:54:00:12:34:00
|
|
|
c36ff1 |
IPADDR=10.0.2.15
|
|
|
c36ff1 |
NETMASK=255.255.255.0
|
|
|
c36ff1 |
-NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
c36ff1 |
USERCTL=no
|
|
|
59e311 |
@@ -3910,7 +3883,6 @@ USERCTL=no
|
|
|
c36ff1 |
#
|
|
|
c36ff1 |
BOOTPROTO=dhcp
|
|
|
c36ff1 |
DEVICE=eth0
|
|
|
c36ff1 |
-NM_CONTROLLED=no
|
|
|
c36ff1 |
ONBOOT=yes
|
|
|
c36ff1 |
TYPE=Ethernet
|
|
|
c36ff1 |
USERCTL=no
|
|
|
c36ff1 |
--
|
|
|
59e311 |
2.31.1
|
|
|
c36ff1 |
|