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