From 2a7c89dc761c6415a97e44ea5cf55885179890cd Mon Sep 17 00:00:00 2001 From: Lars Kellogg-Stedman Date: Thu, 1 Dec 2016 19:40:36 -0500 Subject: [PATCH] Do not write NM_CONTROLLED=no in generated interface config files Resolves: rhbz#1385172 X-downstream-only: true --- cloudinit/net/sysconfig.py | 1 - tests/unittests/test_net.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py index 9be7407..3c9f2d2 100644 --- a/cloudinit/net/sysconfig.py +++ b/cloudinit/net/sysconfig.py @@ -169,7 +169,6 @@ class Renderer(renderer.Renderer): iface_defaults = tuple([ ('ONBOOT', True), ('USERCTL', False), - ('NM_CONTROLLED', False), ('BOOTPROTO', 'none'), ]) diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py index 1090282..ce13664 100755 --- a/tests/unittests/test_net.py +++ b/tests/unittests/test_net.py @@ -144,7 +144,6 @@ GATEWAY=172.19.3.254 HWADDR=fa:16:3e:ed:9a:59 IPADDR=172.19.1.34 NETMASK=255.255.252.0 -NM_CONTROLLED=no ONBOOT=yes TYPE=Ethernet USERCTL=no @@ -510,7 +509,6 @@ class TestSysConfigRendering(TestCase): BOOTPROTO=dhcp DEVICE=eth1000 HWADDR=07-1C-C6-75-A4-BE -NM_CONTROLLED=no ONBOOT=yes TYPE=Ethernet USERCTL=no