|
 |
536667c |
Index: cloud-init-17.1/cloudinit/net/sysconfig.py
|
|
|
536667c |
===================================================================
|
|
|
536667c |
--- cloud-init-17.1.orig/cloudinit/net/sysconfig.py
|
|
|
536667c |
+++ cloud-init-17.1/cloudinit/net/sysconfig.py
|
|
|
536667c |
@@ -230,7 +230,6 @@ class Renderer(renderer.Renderer):
|
|
|
536667c |
iface_defaults = tuple([
|
|
|
536667c |
('ONBOOT', True),
|
|
|
536667c |
('USERCTL', False),
|
|
|
536667c |
- ('NM_CONTROLLED', False),
|
|
|
536667c |
('BOOTPROTO', 'none'),
|
|
|
536667c |
])
|
|
|
536667c |
|
|
|
536667c |
Index: cloud-init-17.1/tests/unittests/test_net.py
|
|
|
536667c |
===================================================================
|
|
|
536667c |
--- cloud-init-17.1.orig/tests/unittests/test_net.py
|
|
|
536667c |
+++ cloud-init-17.1/tests/unittests/test_net.py
|
|
|
536667c |
@@ -146,7 +146,6 @@ GATEWAY=172.19.3.254
|
|
|
536667c |
HWADDR=fa:16:3e:ed:9a:59
|
|
|
536667c |
IPADDR=172.19.1.34
|
|
|
536667c |
NETMASK=255.255.252.0
|
|
|
536667c |
-NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -214,7 +213,6 @@ IPADDR=172.19.1.34
|
|
|
536667c |
IPADDR1=10.0.0.10
|
|
|
536667c |
NETMASK=255.255.252.0
|
|
|
536667c |
NETMASK1=255.255.255.0
|
|
|
536667c |
-NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -304,7 +302,6 @@ IPV6ADDR_SECONDARIES="2001:DB9::10/64 20
|
|
|
536667c |
IPV6INIT=yes
|
|
|
536667c |
IPV6_DEFAULTGW=2001:DB8::1
|
|
|
536667c |
NETMASK=255.255.252.0
|
|
|
536667c |
-NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -428,7 +425,6 @@ NETWORK_CONFIGS = {
|
|
|
536667c |
BOOTPROTO=none
|
|
|
536667c |
DEVICE=eth1
|
|
|
536667c |
HWADDR=cf:d6:af:48:e8:80
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no"""),
|
|
|
536667c |
@@ -440,7 +436,6 @@ NETWORK_CONFIGS = {
|
|
|
536667c |
HWADDR=c0:d6:9f:2c:e8:80
|
|
|
536667c |
IPADDR=192.168.21.3
|
|
|
536667c |
NETMASK=255.255.255.0
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no"""),
|
|
|
536667c |
@@ -552,7 +547,6 @@ NETWORK_CONFIGS = {
|
|
|
536667c |
IPV6ADDR=2001:1::1/64
|
|
|
536667c |
IPV6INIT=yes
|
|
|
536667c |
NETMASK=255.255.255.0
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -794,14 +788,12 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
DHCPV6C=yes
|
|
|
536667c |
IPV6INIT=yes
|
|
|
536667c |
MACADDR=aa:bb:cc:dd:ee:ff
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Bond
|
|
|
536667c |
USERCTL=no"""),
|
|
|
536667c |
'ifcfg-bond0.200': textwrap.dedent("""\
|
|
|
536667c |
BOOTPROTO=dhcp
|
|
|
536667c |
DEVICE=bond0.200
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
PHYSDEV=bond0
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
@@ -817,7 +809,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
IPV6INIT=yes
|
|
|
536667c |
IPV6_DEFAULTGW=2001:4800:78ff:1b::1
|
|
|
536667c |
NETMASK=255.255.255.0
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
PRIO=22
|
|
|
536667c |
STP=off
|
|
|
536667c |
@@ -827,7 +818,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
BOOTPROTO=none
|
|
|
536667c |
DEVICE=eth0
|
|
|
536667c |
HWADDR=c0:d6:9f:2c:e8:80
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no"""),
|
|
|
536667c |
@@ -841,7 +831,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
MTU=1500
|
|
|
536667c |
NETMASK=255.255.255.0
|
|
|
536667c |
NETMASK1=255.255.255.0
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
PHYSDEV=eth0
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
@@ -852,7 +841,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
DEVICE=eth1
|
|
|
536667c |
HWADDR=aa:d6:9f:2c:e8:80
|
|
|
536667c |
MASTER=bond0
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
SLAVE=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
@@ -862,7 +850,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
DEVICE=eth2
|
|
|
536667c |
HWADDR=c0:bb:9f:2c:e8:80
|
|
|
536667c |
MASTER=bond0
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
SLAVE=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
@@ -872,7 +859,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
BRIDGE=br0
|
|
|
536667c |
DEVICE=eth3
|
|
|
536667c |
HWADDR=66:bb:9f:2c:e8:80
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no"""),
|
|
|
536667c |
@@ -881,7 +867,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
BRIDGE=br0
|
|
|
536667c |
DEVICE=eth4
|
|
|
536667c |
HWADDR=98:bb:9f:2c:e8:80
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no"""),
|
|
|
536667c |
@@ -889,7 +874,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
BOOTPROTO=dhcp
|
|
|
536667c |
DEVICE=eth5
|
|
|
536667c |
HWADDR=98:bb:9f:2c:e8:8a
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=no
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no""")
|
|
|
536667c |
@@ -1171,7 +1155,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
IPV6INIT=yes
|
|
|
536667c |
NETMASK=255.255.255.0
|
|
|
536667c |
NETMASK1=255.255.255.0
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Bond
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -1181,7 +1164,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
DEVICE=bond0s0
|
|
|
536667c |
HWADDR=aa:bb:cc:dd:e8:00
|
|
|
536667c |
MASTER=bond0
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
SLAVE=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
@@ -1199,7 +1181,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
DEVICE=bond0s1
|
|
|
536667c |
HWADDR=aa:bb:cc:dd:e8:01
|
|
|
536667c |
MASTER=bond0
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
SLAVE=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
@@ -1236,7 +1217,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
BOOTPROTO=none
|
|
|
536667c |
DEVICE=en0
|
|
|
536667c |
HWADDR=aa:bb:cc:dd:e8:00
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no"""),
|
|
|
536667c |
@@ -1252,7 +1232,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
IPV6_DEFAULTGW=2001:1::1
|
|
|
536667c |
NETMASK=255.255.255.0
|
|
|
536667c |
NETMASK1=255.255.255.0
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
PHYSDEV=en0
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
@@ -1293,7 +1272,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
DEVICE=br0
|
|
|
536667c |
IPADDR=192.168.2.2
|
|
|
536667c |
NETMASK=255.255.255.0
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
PRIO=22
|
|
|
536667c |
STP=off
|
|
|
536667c |
@@ -1307,7 +1285,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
HWADDR=52:54:00:12:34:00
|
|
|
536667c |
IPV6ADDR=2001:1::100/96
|
|
|
536667c |
IPV6INIT=yes
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -1319,7 +1296,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
HWADDR=52:54:00:12:34:01
|
|
|
536667c |
IPV6ADDR=2001:1::101/96
|
|
|
536667c |
IPV6INIT=yes
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -1393,7 +1369,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
HWADDR=52:54:00:12:34:00
|
|
|
536667c |
IPADDR=192.168.1.2
|
|
|
536667c |
NETMASK=255.255.255.0
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=no
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -1403,7 +1378,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
DEVICE=eth1
|
|
|
536667c |
HWADDR=52:54:00:12:34:aa
|
|
|
536667c |
MTU=1480
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -1412,7 +1386,6 @@ pre-down route del -net 10.0.0.0 netmask
|
|
|
536667c |
BOOTPROTO=none
|
|
|
536667c |
DEVICE=eth2
|
|
|
536667c |
HWADDR=52:54:00:12:34:ff
|
|
|
536667c |
- NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=no
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -1685,7 +1658,6 @@ class TestSysConfigRendering(CiTestCase)
|
|
|
536667c |
BOOTPROTO=dhcp
|
|
|
536667c |
DEVICE=eth1000
|
|
|
536667c |
HWADDR=07-1C-C6-75-A4-BE
|
|
|
536667c |
-NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -1805,7 +1777,6 @@ GATEWAY=10.0.2.2
|
|
|
536667c |
HWADDR=52:54:00:12:34:00
|
|
|
536667c |
IPADDR=10.0.2.15
|
|
|
536667c |
NETMASK=255.255.255.0
|
|
|
536667c |
-NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -1826,7 +1797,6 @@ USERCTL=no
|
|
|
536667c |
#
|
|
|
536667c |
BOOTPROTO=dhcp
|
|
|
536667c |
DEVICE=eth0
|
|
|
536667c |
-NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
Index: cloud-init-17.1/tests/unittests/test_distros/test_netconfig.py
|
|
|
536667c |
===================================================================
|
|
|
536667c |
--- cloud-init-17.1.orig/tests/unittests/test_distros/test_netconfig.py
|
|
|
536667c |
+++ cloud-init-17.1/tests/unittests/test_distros/test_netconfig.py
|
|
|
536667c |
@@ -481,7 +481,6 @@ DEVICE=eth0
|
|
|
536667c |
GATEWAY=192.168.1.254
|
|
|
536667c |
IPADDR=192.168.1.5
|
|
|
536667c |
NETMASK=255.255.255.0
|
|
|
536667c |
-NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -498,7 +497,6 @@ USERCTL=no
|
|
|
536667c |
#
|
|
|
536667c |
BOOTPROTO=dhcp
|
|
|
536667c |
DEVICE=eth1
|
|
|
536667c |
-NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -632,7 +630,6 @@ DEVICE=eth0
|
|
|
536667c |
IPV6ADDR=2607:f0d0:1002:0011::2/64
|
|
|
536667c |
IPV6INIT=yes
|
|
|
536667c |
IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
|
|
|
536667c |
-NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|
|
|
536667c |
@@ -647,7 +644,6 @@ USERCTL=no
|
|
|
536667c |
#
|
|
|
536667c |
BOOTPROTO=dhcp
|
|
|
536667c |
DEVICE=eth1
|
|
|
536667c |
-NM_CONTROLLED=no
|
|
|
536667c |
ONBOOT=yes
|
|
|
536667c |
TYPE=Ethernet
|
|
|
536667c |
USERCTL=no
|