LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File cloud-init-sysconf-ethsetup.patch of Package cloud-init (Project Cloud:Tools)

--- cloudinit/net/sysconfig.py.orig
+++ cloudinit/net/sysconfig.py
@@ -252,6 +252,7 @@ class Renderer(renderer.Renderer):
         ('USERCTL', False),
         ('NM_CONTROLLED', False),
         ('BOOTPROTO', 'none'),
+        ('STARTMODE', 'auto'),
     ])
 
     # If these keys exist, then their values will be used to form
@@ -346,6 +347,7 @@ class Renderer(renderer.Renderer):
                                                           iface_cfg.name))
             if subnet.get('control') == 'manual':
                 iface_cfg['ONBOOT'] = False
+                iface_cfg['STARTMODE'] = 'manual'
 
         # set IPv4 and IPv6 static addresses
         ipv4_index = -1
--- tests/unittests/test_distros/test_netconfig.py.orig
+++ tests/unittests/test_distros/test_netconfig.py
@@ -468,6 +468,7 @@ class TestNetCfgDistroRedhat(TestNetCfgD
                 NETMASK=255.255.255.0
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no
                 """),
@@ -476,6 +477,7 @@ class TestNetCfgDistroRedhat(TestNetCfgD
                 DEVICE=eth1
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no
                 """),
@@ -499,6 +501,7 @@ class TestNetCfgDistroRedhat(TestNetCfgD
                 IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no
                 """),
@@ -507,6 +510,7 @@ class TestNetCfgDistroRedhat(TestNetCfgD
                 DEVICE=eth1
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no
                 """),
@@ -559,6 +563,7 @@ class TestNetCfgDistroOpensuse(TestNetCf
                 NETMASK=255.255.255.0
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no
                 """),
@@ -567,6 +572,7 @@ class TestNetCfgDistroOpensuse(TestNetCf
                 DEVICE=eth1
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no
                 """),
@@ -587,6 +593,7 @@ class TestNetCfgDistroOpensuse(TestNetCf
                 IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no
             """),
@@ -595,6 +602,7 @@ class TestNetCfgDistroOpensuse(TestNetCf
                 DEVICE=eth1
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no
             """),
--- tests/unittests/test_net.py.orig
+++ tests/unittests/test_net.py
@@ -144,6 +144,7 @@ IPADDR=172.19.1.34
 NETMASK=255.255.252.0
 NM_CONTROLLED=no
 ONBOOT=yes
+STARTMODE=auto
 TYPE=Ethernet
 USERCTL=no
 """.lstrip()),
@@ -177,6 +178,7 @@ IPADDR=172.19.1.34
 NETMASK=255.255.252.0
 NM_CONTROLLED=no
 ONBOOT=yes
+STARTMODE=auto
 TYPE=Ethernet
 USERCTL=no
 """.lstrip()),
@@ -246,6 +248,7 @@ NETMASK=255.255.252.0
 NETMASK1=255.255.255.0
 NM_CONTROLLED=no
 ONBOOT=yes
+STARTMODE=auto
 TYPE=Ethernet
 USERCTL=no
 """.lstrip()),
@@ -281,6 +284,7 @@ NETMASK=255.255.252.0
 NETMASK1=255.255.255.0
 NM_CONTROLLED=no
 ONBOOT=yes
+STARTMODE=auto
 TYPE=Ethernet
 USERCTL=no
 """.lstrip()),
@@ -372,6 +376,7 @@ IPV6_DEFAULTGW=2001:DB8::1
 NETMASK=255.255.252.0
 NM_CONTROLLED=no
 ONBOOT=yes
+STARTMODE=auto
 TYPE=Ethernet
 USERCTL=no
 """.lstrip()),
@@ -409,6 +414,7 @@ IPV6_DEFAULTGW=2001:DB8::1
 NETMASK=255.255.252.0
 NM_CONTROLLED=no
 ONBOOT=yes
+STARTMODE=auto
 TYPE=Ethernet
 USERCTL=no
 """.lstrip()),
@@ -525,6 +531,7 @@ NETWORK_CONFIGS = {
                 HWADDR=cf:d6:af:48:e8:80
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no"""),
             'ifcfg-eth99': textwrap.dedent("""\
@@ -541,6 +548,7 @@ NETWORK_CONFIGS = {
                 METRIC=10000
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no"""),
         },
@@ -654,6 +662,7 @@ NETWORK_CONFIGS = {
                 NETMASK=255.255.255.0
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no
                 MTU=9000
@@ -693,6 +702,7 @@ NETWORK_CONFIGS = {
                 DEVICE=iface0
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no
                 """),
@@ -896,6 +906,7 @@ pre-down route del -net 10.0.0.0 netmask
                 MACADDR=aa:bb:cc:dd:ee:ff
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Bond
                 USERCTL=no"""),
             'ifcfg-bond0.200': textwrap.dedent("""\
@@ -903,6 +914,7 @@ pre-down route del -net 10.0.0.0 netmask
                 DEVICE=bond0.200
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 PHYSDEV=bond0
                 TYPE=Ethernet
                 USERCTL=no
@@ -920,6 +932,7 @@ pre-down route del -net 10.0.0.0 netmask
                 NETMASK=255.255.255.0
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 PRIO=22
                 STP=no
                 TYPE=Bridge
@@ -930,6 +943,7 @@ pre-down route del -net 10.0.0.0 netmask
                 HWADDR=c0:d6:9f:2c:e8:80
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no"""),
             'ifcfg-eth0.101': textwrap.dedent("""\
@@ -947,6 +961,7 @@ pre-down route del -net 10.0.0.0 netmask
                 NETMASK1=255.255.255.0
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 PHYSDEV=eth0
                 TYPE=Ethernet
                 USERCTL=no
@@ -958,6 +973,7 @@ pre-down route del -net 10.0.0.0 netmask
                 MASTER=bond0
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 SLAVE=yes
                 TYPE=Ethernet
                 USERCTL=no"""),
@@ -968,6 +984,7 @@ pre-down route del -net 10.0.0.0 netmask
                 MASTER=bond0
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 SLAVE=yes
                 TYPE=Ethernet
                 USERCTL=no"""),
@@ -978,6 +995,7 @@ pre-down route del -net 10.0.0.0 netmask
                 HWADDR=66:bb:9f:2c:e8:80
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no"""),
             'ifcfg-eth4': textwrap.dedent("""\
@@ -987,6 +1005,7 @@ pre-down route del -net 10.0.0.0 netmask
                 HWADDR=98:bb:9f:2c:e8:80
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no"""),
             'ifcfg-eth5': textwrap.dedent("""\
@@ -995,6 +1014,7 @@ pre-down route del -net 10.0.0.0 netmask
                 HWADDR=98:bb:9f:2c:e8:8a
                 NM_CONTROLLED=no
                 ONBOOT=no
+                STARTMODE=manual
                 TYPE=Ethernet
                 USERCTL=no""")
         },
@@ -1306,6 +1326,7 @@ pre-down route del -net 10.0.0.0 netmask
         NETMASK1=255.255.255.0
         NM_CONTROLLED=no
         ONBOOT=yes
+        STARTMODE=auto
         TYPE=Bond
         USERCTL=no
         """),
@@ -1316,6 +1337,7 @@ pre-down route del -net 10.0.0.0 netmask
         MASTER=bond0
         NM_CONTROLLED=no
         ONBOOT=yes
+        STARTMODE=auto
         SLAVE=yes
         TYPE=Ethernet
         USERCTL=no
@@ -1332,6 +1354,7 @@ pre-down route del -net 10.0.0.0 netmask
         MASTER=bond0
         NM_CONTROLLED=no
         ONBOOT=yes
+        STARTMODE=auto
         SLAVE=yes
         TYPE=Ethernet
         USERCTL=no
@@ -1358,6 +1381,7 @@ pre-down route del -net 10.0.0.0 netmask
         NETMASK1=255.255.255.0
         NM_CONTROLLED=no
         ONBOOT=yes
+        STARTMODE=auto
         TYPE=Bond
         USERCTL=no
         """),
@@ -1368,6 +1392,7 @@ pre-down route del -net 10.0.0.0 netmask
         MASTER=bond0
         NM_CONTROLLED=no
         ONBOOT=yes
+        STARTMODE=auto
         SLAVE=yes
         TYPE=Ethernet
         USERCTL=no
@@ -1390,6 +1415,7 @@ pre-down route del -net 10.0.0.0 netmask
         MASTER=bond0
         NM_CONTROLLED=no
         ONBOOT=yes
+        STARTMODE=auto
         SLAVE=yes
         TYPE=Ethernet
         USERCTL=no
@@ -1428,6 +1454,7 @@ pre-down route del -net 10.0.0.0 netmask
                 HWADDR=aa:bb:cc:dd:e8:00
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no"""),
             'ifcfg-en0.99': textwrap.dedent("""\
@@ -1445,6 +1472,7 @@ pre-down route del -net 10.0.0.0 netmask
                 NETMASK1=255.255.255.0
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 PHYSDEV=en0
                 TYPE=Ethernet
                 USERCTL=no
@@ -1486,6 +1514,7 @@ pre-down route del -net 10.0.0.0 netmask
                 NETMASK=255.255.255.0
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 PRIO=22
                 STP=no
                 TYPE=Bridge
@@ -1500,6 +1529,7 @@ pre-down route del -net 10.0.0.0 netmask
                 IPV6INIT=yes
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no
                 """),
@@ -1512,6 +1542,7 @@ pre-down route del -net 10.0.0.0 netmask
                 IPV6INIT=yes
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no
                 """),
@@ -1586,6 +1617,7 @@ pre-down route del -net 10.0.0.0 netmask
                 NETMASK=255.255.255.0
                 NM_CONTROLLED=no
                 ONBOOT=no
+                STARTMODE=manual
                 TYPE=Ethernet
                 USERCTL=no
                 """),
@@ -1596,6 +1628,7 @@ pre-down route del -net 10.0.0.0 netmask
                 MTU=1480
                 NM_CONTROLLED=no
                 ONBOOT=yes
+                STARTMODE=auto
                 TYPE=Ethernet
                 USERCTL=no
                 """),
@@ -1605,6 +1638,7 @@ pre-down route del -net 10.0.0.0 netmask
                 HWADDR=52:54:00:12:34:ff
                 NM_CONTROLLED=no
                 ONBOOT=no
+                STARTMODE=manual
                 TYPE=Ethernet
                 USERCTL=no
                 """),
@@ -1971,6 +2005,7 @@ DEVICE=eth1000
 HWADDR=07-1C-C6-75-A4-BE
 NM_CONTROLLED=no
 ONBOOT=yes
+STARTMODE=auto
 TYPE=Ethernet
 USERCTL=no
 """.lstrip()
@@ -2092,6 +2127,7 @@ IPADDR=10.0.2.15
 NETMASK=255.255.255.0
 NM_CONTROLLED=no
 ONBOOT=yes
+STARTMODE=auto
 TYPE=Ethernet
 USERCTL=no
 """
@@ -2113,6 +2149,7 @@ BOOTPROTO=dhcp
 DEVICE=eth0
 NM_CONTROLLED=no
 ONBOOT=yes
+STARTMODE=auto
 TYPE=Ethernet
 USERCTL=no
 """
@@ -2260,6 +2297,7 @@ DEVICE=eth1000
 HWADDR=07-1C-C6-75-A4-BE
 NM_CONTROLLED=no
 ONBOOT=yes
+STARTMODE=auto
 TYPE=Ethernet
 USERCTL=no
 """.lstrip()
@@ -2381,6 +2419,7 @@ IPADDR=10.0.2.15
 NETMASK=255.255.255.0
 NM_CONTROLLED=no
 ONBOOT=yes
+STARTMODE=auto
 TYPE=Ethernet
 USERCTL=no
 """
@@ -2402,6 +2441,7 @@ BOOTPROTO=dhcp
 DEVICE=eth0
 NM_CONTROLLED=no
 ONBOOT=yes
+STARTMODE=auto
 TYPE=Ethernet
 USERCTL=no
 """