Blame cloud-init-0.7.8-nm-controlled.patch
|
 |
b48cb59 |
Index: cloud-init-0.7.8/cloudinit/net/sysconfig.py
|
|
|
b48cb59 |
===================================================================
|
|
|
b48cb59 |
--- cloud-init-0.7.8.orig/cloudinit/net/sysconfig.py
|
|
|
b48cb59 |
+++ cloud-init-0.7.8/cloudinit/net/sysconfig.py
|
|
|
b48cb59 |
@@ -181,7 +181,6 @@ class Renderer(renderer.Renderer):
|
|
|
b48cb59 |
iface_defaults = tuple([
|
|
|
b48cb59 |
('ONBOOT', True),
|
|
|
b48cb59 |
('USERCTL', False),
|
|
|
b48cb59 |
- ('NM_CONTROLLED', False),
|
|
|
b48cb59 |
('BOOTPROTO', 'none'),
|
|
|
b48cb59 |
])
|
|
|
b48cb59 |
|
|
|
b48cb59 |
Index: cloud-init-0.7.8/tests/unittests/test_net.py
|
|
|
b48cb59 |
===================================================================
|
|
|
b48cb59 |
--- cloud-init-0.7.8.orig/tests/unittests/test_net.py
|
|
|
b48cb59 |
+++ cloud-init-0.7.8/tests/unittests/test_net.py
|
|
|
b48cb59 |
@@ -119,7 +119,6 @@ GATEWAY=172.19.3.254
|
|
|
b48cb59 |
HWADDR=fa:16:3e:ed:9a:59
|
|
|
b48cb59 |
IPADDR=172.19.1.34
|
|
|
b48cb59 |
NETMASK=255.255.252.0
|
|
|
b48cb59 |
-NM_CONTROLLED=no
|
|
|
b48cb59 |
ONBOOT=yes
|
|
|
b48cb59 |
TYPE=Ethernet
|
|
|
b48cb59 |
USERCTL=no
|
|
|
b48cb59 |
@@ -483,7 +482,6 @@ class TestSysConfigRendering(TestCase):
|
|
|
b48cb59 |
BOOTPROTO=dhcp
|
|
|
b48cb59 |
DEVICE=eth1000
|
|
|
b48cb59 |
HWADDR=07-1C-C6-75-A4-BE
|
|
|
b48cb59 |
-NM_CONTROLLED=no
|
|
|
b48cb59 |
ONBOOT=yes
|
|
|
b48cb59 |
TYPE=Ethernet
|
|
|
b48cb59 |
USERCTL=no
|