8a7340
From aa7ae9da7e10a5bcf190f8df3072e3864b2d8fb3 Mon Sep 17 00:00:00 2001
18322d
From: Miroslav Rezanina <mrezanin@redhat.com>
18322d
Date: Thu, 31 May 2018 19:37:55 +0200
18322d
Subject: Do not write NM_CONTROLLED=no in generated interface config  files
18322d
18322d
X-downstream-only: true
18322d
Signed-off-by: Ryan McCabe <rmccabe@redhat.com>
18322d
---
18322d
 cloudinit/net/sysconfig.py  |  1 -
18322d
 tests/unittests/test_net.py | 30 ------------------------------
18322d
 2 files changed, 31 deletions(-)
18322d
18322d
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
8a7340
index 310cdf0..8bd7e88 100644
18322d
--- a/cloudinit/net/sysconfig.py
18322d
+++ b/cloudinit/net/sysconfig.py
8a7340
@@ -272,7 +272,6 @@ class Renderer(renderer.Renderer):
18322d
     iface_defaults = tuple([
18322d
         ('ONBOOT', True),
18322d
         ('USERCTL', False),
18322d
-        ('NM_CONTROLLED', False),
18322d
         ('BOOTPROTO', 'none'),
8a7340
         ('STARTMODE', 'auto'),
18322d
     ])
18322d
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
8a7340
index 01119e0..a931a3e 100644
18322d
--- a/tests/unittests/test_net.py
18322d
+++ b/tests/unittests/test_net.py
8a7340
@@ -530,7 +530,6 @@ GATEWAY=172.19.3.254
18322d
 HWADDR=fa:16:3e:ed:9a:59
18322d
 IPADDR=172.19.1.34
18322d
 NETMASK=255.255.252.0
18322d
-NM_CONTROLLED=no
18322d
 ONBOOT=yes
8a7340
 STARTMODE=auto
18322d
 TYPE=Ethernet
8a7340
@@ -636,7 +635,6 @@ IPADDR=172.19.1.34
18322d
 IPADDR1=10.0.0.10
18322d
 NETMASK=255.255.252.0
18322d
 NETMASK1=255.255.255.0
18322d
-NM_CONTROLLED=no
18322d
 ONBOOT=yes
8a7340
 STARTMODE=auto
18322d
 TYPE=Ethernet
8a7340
@@ -772,7 +770,6 @@ IPV6ADDR_SECONDARIES="2001:DB9::10/64 2001:DB10::10/64"
18322d
 IPV6INIT=yes
18322d
 IPV6_DEFAULTGW=2001:DB8::1
18322d
 NETMASK=255.255.252.0
18322d
-NM_CONTROLLED=no
18322d
 ONBOOT=yes
8a7340
 STARTMODE=auto
18322d
 TYPE=Ethernet
8a7340
@@ -889,7 +886,6 @@ NETWORK_CONFIGS = {
18322d
                 BOOTPROTO=none
18322d
                 DEVICE=eth1
18322d
                 HWADDR=cf:d6:af:48:e8:80
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
8a7340
                 STARTMODE=auto
18322d
                 TYPE=Ethernet
8a7340
@@ -907,7 +903,6 @@ NETWORK_CONFIGS = {
18322d
                 IPADDR=192.168.21.3
18322d
                 NETMASK=255.255.255.0
18322d
                 METRIC=10000
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
8a7340
                 STARTMODE=auto
18322d
                 TYPE=Ethernet
8a7340
@@ -1022,7 +1017,6 @@ NETWORK_CONFIGS = {
18322d
                 IPV6ADDR=2001:1::1/64
18322d
                 IPV6INIT=yes
18322d
                 NETMASK=255.255.255.0
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
8a7340
                 STARTMODE=auto
18322d
                 TYPE=Ethernet
8a7340
@@ -1491,7 +1485,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
18322d
                 DHCPV6C=yes
18322d
                 IPV6INIT=yes
18322d
                 MACADDR=aa:bb:cc:dd:ee:ff
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
8a7340
                 STARTMODE=auto
18322d
                 TYPE=Bond
8a7340
@@ -1500,7 +1493,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
18322d
                 BOOTPROTO=dhcp
18322d
                 DEVICE=bond0.200
8a7340
                 DHCLIENT_SET_DEFAULT_ROUTE=no
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
18322d
                 PHYSDEV=bond0
8a7340
                 STARTMODE=auto
8a7340
@@ -1519,7 +1511,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
18322d
                 IPV6_DEFAULTGW=2001:4800:78ff:1b::1
18322d
                 MACADDR=bb:bb:bb:bb:bb:aa
18322d
                 NETMASK=255.255.255.0
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
18322d
                 PRIO=22
8a7340
                 STARTMODE=auto
8a7340
@@ -1530,7 +1521,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
18322d
                 BOOTPROTO=none
18322d
                 DEVICE=eth0
18322d
                 HWADDR=c0:d6:9f:2c:e8:80
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
8a7340
                 STARTMODE=auto
18322d
                 TYPE=Ethernet
8a7340
@@ -1548,7 +1538,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
18322d
                 MTU=1500
18322d
                 NETMASK=255.255.255.0
18322d
                 NETMASK1=255.255.255.0
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
18322d
                 PHYSDEV=eth0
8a7340
                 STARTMODE=auto
8a7340
@@ -1560,7 +1549,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
18322d
                 DEVICE=eth1
18322d
                 HWADDR=aa:d6:9f:2c:e8:80
18322d
                 MASTER=bond0
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
8a7340
                 STARTMODE=auto
18322d
                 SLAVE=yes
8a7340
@@ -1571,7 +1559,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
18322d
                 DEVICE=eth2
18322d
                 HWADDR=c0:bb:9f:2c:e8:80
18322d
                 MASTER=bond0
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
8a7340
                 STARTMODE=auto
18322d
                 SLAVE=yes
8a7340
@@ -1582,7 +1569,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
18322d
                 BRIDGE=br0
18322d
                 DEVICE=eth3
18322d
                 HWADDR=66:bb:9f:2c:e8:80
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
8a7340
                 STARTMODE=auto
18322d
                 TYPE=Ethernet
8a7340
@@ -1592,7 +1578,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
18322d
                 BRIDGE=br0
18322d
                 DEVICE=eth4
18322d
                 HWADDR=98:bb:9f:2c:e8:80
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
8a7340
                 STARTMODE=auto
18322d
                 TYPE=Ethernet
8a7340
@@ -1602,7 +1587,6 @@ pre-down route del -net 10.0.0.0/8 gw 11.0.0.1 metric 3 || true
18322d
                 DEVICE=eth5
8a7340
                 DHCLIENT_SET_DEFAULT_ROUTE=no
18322d
                 HWADDR=98:bb:9f:2c:e8:8a
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=no
8a7340
                 STARTMODE=manual
18322d
                 TYPE=Ethernet
8a7340
@@ -2088,7 +2072,6 @@ iface bond0 inet6 static
18322d
         MTU=9000
18322d
         NETMASK=255.255.255.0
18322d
         NETMASK1=255.255.255.0
18322d
-        NM_CONTROLLED=no
18322d
         ONBOOT=yes
8a7340
         STARTMODE=auto
18322d
         TYPE=Bond
8a7340
@@ -2099,7 +2082,6 @@ iface bond0 inet6 static
18322d
         DEVICE=bond0s0
18322d
         HWADDR=aa:bb:cc:dd:e8:00
18322d
         MASTER=bond0
18322d
-        NM_CONTROLLED=no
18322d
         ONBOOT=yes
18322d
         SLAVE=yes
8a7340
         STARTMODE=auto
8a7340
@@ -2122,7 +2104,6 @@ iface bond0 inet6 static
18322d
         DEVICE=bond0s1
18322d
         HWADDR=aa:bb:cc:dd:e8:01
18322d
         MASTER=bond0
18322d
-        NM_CONTROLLED=no
18322d
         ONBOOT=yes
18322d
         SLAVE=yes
8a7340
         STARTMODE=auto
8a7340
@@ -2161,7 +2142,6 @@ iface bond0 inet6 static
18322d
                 BOOTPROTO=none
18322d
                 DEVICE=en0
18322d
                 HWADDR=aa:bb:cc:dd:e8:00
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
8a7340
                 STARTMODE=auto
18322d
                 TYPE=Ethernet
8a7340
@@ -2180,7 +2160,6 @@ iface bond0 inet6 static
18322d
                 MTU=2222
18322d
                 NETMASK=255.255.255.0
18322d
                 NETMASK1=255.255.255.0
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
18322d
                 PHYSDEV=en0
8a7340
                 STARTMODE=auto
8a7340
@@ -2222,7 +2201,6 @@ iface bond0 inet6 static
18322d
                 DEVICE=br0
18322d
                 IPADDR=192.168.2.2
18322d
                 NETMASK=255.255.255.0
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
18322d
                 PRIO=22
8a7340
                 STARTMODE=auto
8a7340
@@ -2238,7 +2216,6 @@ iface bond0 inet6 static
8a7340
                 IPADDR6=2001:1::100/96
18322d
                 IPV6ADDR=2001:1::100/96
18322d
                 IPV6INIT=yes
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
8a7340
                 STARTMODE=auto
18322d
                 TYPE=Ethernet
8a7340
@@ -2252,7 +2229,6 @@ iface bond0 inet6 static
8a7340
                 IPADDR6=2001:1::101/96
18322d
                 IPV6ADDR=2001:1::101/96
18322d
                 IPV6INIT=yes
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
8a7340
                 STARTMODE=auto
18322d
                 TYPE=Ethernet
8a7340
@@ -2327,7 +2303,6 @@ iface bond0 inet6 static
18322d
                 HWADDR=52:54:00:12:34:00
18322d
                 IPADDR=192.168.1.2
18322d
                 NETMASK=255.255.255.0
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=no
8a7340
                 STARTMODE=manual
18322d
                 TYPE=Ethernet
8a7340
@@ -2338,7 +2313,6 @@ iface bond0 inet6 static
18322d
                 DEVICE=eth1
18322d
                 HWADDR=52:54:00:12:34:aa
18322d
                 MTU=1480
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=yes
8a7340
                 STARTMODE=auto
18322d
                 TYPE=Ethernet
8a7340
@@ -2348,7 +2322,6 @@ iface bond0 inet6 static
18322d
                 BOOTPROTO=none
18322d
                 DEVICE=eth2
18322d
                 HWADDR=52:54:00:12:34:ff
18322d
-                NM_CONTROLLED=no
18322d
                 ONBOOT=no
8a7340
                 STARTMODE=manual
18322d
                 TYPE=Ethernet
8a7340
@@ -2766,7 +2739,6 @@ class TestRhelSysConfigRendering(CiTestCase):
18322d
 BOOTPROTO=dhcp
18322d
 DEVICE=eth1000
8a7340
 HWADDR=07-1c-c6-75-a4-be
18322d
-NM_CONTROLLED=no
18322d
 ONBOOT=yes
8a7340
 STARTMODE=auto
18322d
 TYPE=Ethernet
8a7340
@@ -2888,7 +2860,6 @@ GATEWAY=10.0.2.2
18322d
 HWADDR=52:54:00:12:34:00
18322d
 IPADDR=10.0.2.15
18322d
 NETMASK=255.255.255.0
18322d
-NM_CONTROLLED=no
18322d
 ONBOOT=yes
8a7340
 STARTMODE=auto
18322d
 TYPE=Ethernet
8a7340
@@ -2961,7 +2932,6 @@ USERCTL=no
18322d
 #
18322d
 BOOTPROTO=dhcp
18322d
 DEVICE=eth0
18322d
-NM_CONTROLLED=no
18322d
 ONBOOT=yes
8a7340
 STARTMODE=auto
18322d
 TYPE=Ethernet
18322d
-- 
8a7340
1.8.3.1
18322d