rpms/cloud-init
8
1
Fork 1
Code Issues Pull Requests Releases Activity

Do not write NM_CONTROLLED=no in generated interface config files

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1385172
This commit is contained in:
Garrett Holmstrom 2016-10-14 14:08:02 -07:00
parent 10d7e75053
commit b48cb59de2
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cloud-init-0.7.8-nm-controlled.patch Normal file
View File

@ -0,0 +1,32 @@
Index: cloud-init-0.7.8/cloudinit/net/sysconfig.py
===================================================================
--- cloud-init-0.7.8.orig/cloudinit/net/sysconfig.py
+++ cloud-init-0.7.8/cloudinit/net/sysconfig.py
@@ -181,7 +181,6 @@ class Renderer(renderer.Renderer):
iface_defaults = tuple([
('ONBOOT', True),
('USERCTL', False),
- ('NM_CONTROLLED', False),
('BOOTPROTO', 'none'),
])
Index: cloud-init-0.7.8/tests/unittests/test_net.py
===================================================================
--- cloud-init-0.7.8.orig/tests/unittests/test_net.py
+++ cloud-init-0.7.8/tests/unittests/test_net.py
@@ -119,7 +119,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
@@ -483,7 +482,6 @@ class TestSysConfigRendering(TestCase):
BOOTPROTO=dhcp
DEVICE=eth1000
HWADDR=07-1C-C6-75-A4-BE
-NM_CONTROLLED=no
ONBOOT=yes
TYPE=Ethernet
USERCTL=no

9
cloud-init.spec
View File

@ -1,6 +1,6 @@
Name: cloud-init
Version: 0.7.8
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Cloud instance init scripts
Group: System Environment/Base
@ -45,6 +45,10 @@ Patch9: cloud-init-0.7.8-before-nm.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1380489
Patch10: cloud-init-0.7.8-digitalocean-net.patch
# Do not write NM_CONTROLLED=no in generated interface config files
# https://bugzilla.redhat.com/show_bug.cgi?id=1385172
Patch11: cloud-init-0.7.8-nm-controlled.patch
BuildArch: noarch
BuildRequires: pkgconfig
@ -185,6 +189,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Oct 14 2016 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.8-2
- Stopped writing NM_CONTROLLED=no to interface config files [RH:1385172]
* Thu Sep 29 2016 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.8-1
- Updated to 0.7.8
- Dropped run-parts dependency [RH:1355917]