cloud-init

Merge ~chad.smith/cloud-init:ubuntu/xenial into cloud-init:ubuntu/xenial

  1. Git
  2. lp:~chad.smith/cloud-init
  3. ubuntu/xenial
  4. Merge into ubuntu/xenial
Proposed by Chad Smith
Status: Merged
Merged at revision: 44066f4601f21640909bda93d70375ca5100b560
Proposed branch: ~chad.smith/cloud-init:ubuntu/xenial
Merge into: cloud-init:ubuntu/xenial
Diff against target: 555 lines (+84/-8)
8 files modified
cloudinit/config/cc_rh_subscription.py (+3/-3)
cloudinit/net/sysconfig.py (+2/-0)
cloudinit/sources/DataSourceOpenNebula.py (+3/-1)
debian/changelog (+13/-1)
setup.py (+10/-3)
systemd/cloud-init-generator.tmpl (+5/-0)
tests/unittests/test_distros/test_netconfig.py (+8/-0)
tests/unittests/test_net.py (+40/-0)
Reviewer Review Type Date Requested Status
Ryan Harper Approve
Server Team CI bot continuous-integration Approve
Review via email: mp+362367@code.launchpad.net

Commit message

new upstream snapshot fixing intermittent unittest failure on opennebula. SRU into xenial

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:44066f4601f21640909bda93d70375ca5100b560
https://jenkins.ubuntu.com/server/job/cloud-init-ci/550/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/550/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ryan Harper (raharper) :
review: Approve

Update scan failed

At least one of the branches involved have failed to scan. You can manually schedule a rescan if required.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/config/cc_rh_subscription.py b/cloudinit/config/cc_rh_subscription.py
2index edee01e..28c79b8 100644
3--- a/cloudinit/config/cc_rh_subscription.py
4+++ b/cloudinit/config/cc_rh_subscription.py
5@@ -249,14 +249,14 @@ class SubscriptionManager(object):
6 except util.ProcessExecutionError as e:
7 if e.stdout.rstrip() != '':
8 for line in e.stdout.split("\n"):
9- if line is not '':
10+ if line != '':
11 self.log_warn(line)
12 else:
13 self.log_warn("Setting the service level failed with: "
14 "{0}".format(e.stderr.strip()))
15 return False
16 for line in return_out.split("\n"):
17- if line is not "":
18+ if line != "":
19 self.log.debug(line)
20 return True
21
22@@ -268,7 +268,7 @@ class SubscriptionManager(object):
23 self.log_warn("Auto-attach failed with: {0}".format(e))
24 return False
25 for line in return_out.split("\n"):
26- if line is not "":
27+ if line != "":
28 self.log.debug(line)
29 return True
30
31diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
32index fd8e501..19b3e60 100644
33--- a/cloudinit/net/sysconfig.py
34+++ b/cloudinit/net/sysconfig.py
35@@ -273,6 +273,7 @@ class Renderer(renderer.Renderer):
36 ('USERCTL', False),
37 ('NM_CONTROLLED', False),
38 ('BOOTPROTO', 'none'),
39+ ('STARTMODE', 'auto'),
40 ])
41
42 # If these keys exist, then their values will be used to form
43@@ -367,6 +368,7 @@ class Renderer(renderer.Renderer):
44 iface_cfg.name))
45 if subnet.get('control') == 'manual':
46 iface_cfg['ONBOOT'] = False
47+ iface_cfg['STARTMODE'] = 'manual'
48
49 # set IPv4 and IPv6 static addresses
50 ipv4_index = -1
51diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py
52index 6e1d04b..02c9a7b 100644
53--- a/cloudinit/sources/DataSourceOpenNebula.py
54+++ b/cloudinit/sources/DataSourceOpenNebula.py
55@@ -337,7 +337,9 @@ def parse_shell_config(content, keylist=None, bash=None, asuser=None,
56 (output, _error) = util.subp(cmd, data=bcmd)
57
58 # exclude vars in bash that change on their own or that we used
59- excluded = ("EPOCHREALTIME", "RANDOM", "LINENO", "SECONDS", "_", "__v")
60+ excluded = (
61+ "EPOCHREALTIME", "EPOCHSECONDS", "RANDOM", "LINENO", "SECONDS", "_",
62+ "__v")
63 preset = {}
64 ret = {}
65 target = None
66diff --git a/debian/changelog b/debian/changelog
67index 7890d01..a62dba2 100644
68--- a/debian/changelog
69+++ b/debian/changelog
70@@ -1,3 +1,15 @@
71+cloud-init (18.5-21-g8ee294d5-0ubuntu1~16.04.1) xenial; urgency=medium
72+
73+ * New upstream snapshot. (LP: #1813346)
74+ - opennebula: also exclude epochseconds from changed environment vars
75+ - systemd: Render generator from template to account for system
76+ differences. [Robert Schweikert]
77+ - sysconfig: On SUSE, use STARTMODE instead of ONBOOT [Robert Schweikert]
78+ - flake8: use ==/!= to compare str, bytes, and int literals
79+ [Paride Legovini]
80+
81+ -- Chad Smith <chad.smith@canonical.com> Mon, 28 Jan 2019 20:27:06 -0700
82+
83 cloud-init (18.5-17-gd1a2fe73-0ubuntu1~16.04.1) xenial; urgency=medium
84
85 * drop the following cherry-picks now included:
86@@ -7,7 +19,7 @@ cloud-init (18.5-17-gd1a2fe73-0ubuntu1~16.04.1) xenial; urgency=medium
87 * refresh patches:
88 + debian/patches/azure-apply-network-config-false.patch
89 + debian/patches/azure-use-walinux-agent.patch
90- * New upstream snapshot. (LP: #1813346)
91+ * New upstream snapshot.
92 - opennebula: exclude EPOCHREALTIME as known bash env variable with a delta
93 - tox: fix disco httpretty dependencies for py37
94 - run-container: uncomment baseurl in yum.repos.d/*.repo when using a
95diff --git a/setup.py b/setup.py
96index ea37efc..186e215 100755
97--- a/setup.py
98+++ b/setup.py
99@@ -30,6 +30,8 @@ VARIANT = None
100 def is_f(p):
101 return os.path.isfile(p)
102
103+def is_generator(p):
104+ return '-generator' in p
105
106 def tiny_p(cmd, capture=True):
107 # Darn python 2.6 doesn't have check_output (argggg)
108@@ -90,7 +92,7 @@ def read_requires():
109 return str(deps).splitlines()
110
111
112-def render_tmpl(template):
113+def render_tmpl(template, mode=None):
114 """render template into a tmpdir under same dir as setup.py
115
116 This is rendered to a temporary directory under the top level
117@@ -119,6 +121,8 @@ def render_tmpl(template):
118 VARIANT, template, fpath])
119 else:
120 tiny_p([sys.executable, './tools/render-cloudcfg', template, fpath])
121+ if mode:
122+ os.chmod(fpath, mode)
123 # return path relative to setup.py
124 return os.path.join(os.path.basename(tmpd), bname)
125
126@@ -138,8 +142,11 @@ INITSYS_FILES = {
127 'systemd': [render_tmpl(f)
128 for f in (glob('systemd/*.tmpl') +
129 glob('systemd/*.service') +
130- glob('systemd/*.target')) if is_f(f)],
131- 'systemd.generators': [f for f in glob('systemd/*-generator') if is_f(f)],
132+ glob('systemd/*.target'))
133+ if (is_f(f) and not is_generator(f))],
134+ 'systemd.generators': [
135+ render_tmpl(f, mode=0o755)
136+ for f in glob('systemd/*') if is_f(f) and is_generator(f)],
137 'upstart': [f for f in glob('upstart/*') if is_f(f)],
138 }
139 INITSYS_ROOTS = {
140diff --git a/systemd/cloud-init-generator b/systemd/cloud-init-generator.tmpl
141similarity index 90%
142rename from systemd/cloud-init-generator
143rename to systemd/cloud-init-generator.tmpl
144index bd9f267..cfa5eb5 100755
145--- a/systemd/cloud-init-generator
146+++ b/systemd/cloud-init-generator.tmpl
147@@ -1,3 +1,4 @@
148+## template:jinja
149 #!/bin/sh
150 set -f
151
152@@ -9,7 +10,11 @@ DISABLE="disabled"
153 FOUND="found"
154 NOTFOUND="notfound"
155 RUN_ENABLED_FILE="$LOG_D/$ENABLE"
156+{% if variant in ["suse"] %}
157+CLOUD_SYSTEM_TARGET="/usr/lib/systemd/system/cloud-init.target"
158+{% else %}
159 CLOUD_SYSTEM_TARGET="/lib/systemd/system/cloud-init.target"
160+{% endif %}
161 CLOUD_TARGET_NAME="cloud-init.target"
162 # lxc sets 'container', but lets make that explicitly a global
163 CONTAINER="${container}"
164diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
165index 6e33935..e986b59 100644
166--- a/tests/unittests/test_distros/test_netconfig.py
167+++ b/tests/unittests/test_distros/test_netconfig.py
168@@ -468,6 +468,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
169 NETMASK=255.255.255.0
170 NM_CONTROLLED=no
171 ONBOOT=yes
172+ STARTMODE=auto
173 TYPE=Ethernet
174 USERCTL=no
175 """),
176@@ -476,6 +477,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
177 DEVICE=eth1
178 NM_CONTROLLED=no
179 ONBOOT=yes
180+ STARTMODE=auto
181 TYPE=Ethernet
182 USERCTL=no
183 """),
184@@ -499,6 +501,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
185 IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
186 NM_CONTROLLED=no
187 ONBOOT=yes
188+ STARTMODE=auto
189 TYPE=Ethernet
190 USERCTL=no
191 """),
192@@ -507,6 +510,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
193 DEVICE=eth1
194 NM_CONTROLLED=no
195 ONBOOT=yes
196+ STARTMODE=auto
197 TYPE=Ethernet
198 USERCTL=no
199 """),
200@@ -559,6 +563,7 @@ class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
201 NETMASK=255.255.255.0
202 NM_CONTROLLED=no
203 ONBOOT=yes
204+ STARTMODE=auto
205 TYPE=Ethernet
206 USERCTL=no
207 """),
208@@ -567,6 +572,7 @@ class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
209 DEVICE=eth1
210 NM_CONTROLLED=no
211 ONBOOT=yes
212+ STARTMODE=auto
213 TYPE=Ethernet
214 USERCTL=no
215 """),
216@@ -587,6 +593,7 @@ class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
217 IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
218 NM_CONTROLLED=no
219 ONBOOT=yes
220+ STARTMODE=auto
221 TYPE=Ethernet
222 USERCTL=no
223 """),
224@@ -595,6 +602,7 @@ class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
225 DEVICE=eth1
226 NM_CONTROLLED=no
227 ONBOOT=yes
228+ STARTMODE=auto
229 TYPE=Ethernet
230 USERCTL=no
231 """),
232diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
233index 5313d2d..e041e97 100644
234--- a/tests/unittests/test_net.py
235+++ b/tests/unittests/test_net.py
236@@ -145,6 +145,7 @@ IPADDR=172.19.1.34
237 NETMASK=255.255.252.0
238 NM_CONTROLLED=no
239 ONBOOT=yes
240+STARTMODE=auto
241 TYPE=Ethernet
242 USERCTL=no
243 """.lstrip()),
244@@ -178,6 +179,7 @@ IPADDR=172.19.1.34
245 NETMASK=255.255.252.0
246 NM_CONTROLLED=no
247 ONBOOT=yes
248+STARTMODE=auto
249 TYPE=Ethernet
250 USERCTL=no
251 """.lstrip()),
252@@ -247,6 +249,7 @@ NETMASK=255.255.252.0
253 NETMASK1=255.255.255.0
254 NM_CONTROLLED=no
255 ONBOOT=yes
256+STARTMODE=auto
257 TYPE=Ethernet
258 USERCTL=no
259 """.lstrip()),
260@@ -282,6 +285,7 @@ NETMASK=255.255.252.0
261 NETMASK1=255.255.255.0
262 NM_CONTROLLED=no
263 ONBOOT=yes
264+STARTMODE=auto
265 TYPE=Ethernet
266 USERCTL=no
267 """.lstrip()),
268@@ -373,6 +377,7 @@ IPV6_DEFAULTGW=2001:DB8::1
269 NETMASK=255.255.252.0
270 NM_CONTROLLED=no
271 ONBOOT=yes
272+STARTMODE=auto
273 TYPE=Ethernet
274 USERCTL=no
275 """.lstrip()),
276@@ -410,6 +415,7 @@ IPV6_DEFAULTGW=2001:DB8::1
277 NETMASK=255.255.252.0
278 NM_CONTROLLED=no
279 ONBOOT=yes
280+STARTMODE=auto
281 TYPE=Ethernet
282 USERCTL=no
283 """.lstrip()),
284@@ -526,6 +532,7 @@ NETWORK_CONFIGS = {
285 HWADDR=cf:d6:af:48:e8:80
286 NM_CONTROLLED=no
287 ONBOOT=yes
288+ STARTMODE=auto
289 TYPE=Ethernet
290 USERCTL=no"""),
291 'ifcfg-eth99': textwrap.dedent("""\
292@@ -542,6 +549,7 @@ NETWORK_CONFIGS = {
293 METRIC=10000
294 NM_CONTROLLED=no
295 ONBOOT=yes
296+ STARTMODE=auto
297 TYPE=Ethernet
298 USERCTL=no"""),
299 },
300@@ -655,6 +663,7 @@ NETWORK_CONFIGS = {
301 NETMASK=255.255.255.0
302 NM_CONTROLLED=no
303 ONBOOT=yes
304+ STARTMODE=auto
305 TYPE=Ethernet
306 USERCTL=no
307 MTU=9000
308@@ -694,6 +703,7 @@ NETWORK_CONFIGS = {
309 DEVICE=iface0
310 NM_CONTROLLED=no
311 ONBOOT=yes
312+ STARTMODE=auto
313 TYPE=Ethernet
314 USERCTL=no
315 """),
316@@ -897,6 +907,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
317 MACADDR=aa:bb:cc:dd:ee:ff
318 NM_CONTROLLED=no
319 ONBOOT=yes
320+ STARTMODE=auto
321 TYPE=Bond
322 USERCTL=no"""),
323 'ifcfg-bond0.200': textwrap.dedent("""\
324@@ -905,6 +916,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
325 NM_CONTROLLED=no
326 ONBOOT=yes
327 PHYSDEV=bond0
328+ STARTMODE=auto
329 TYPE=Ethernet
330 USERCTL=no
331 VLAN=yes"""),
332@@ -922,6 +934,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
333 NM_CONTROLLED=no
334 ONBOOT=yes
335 PRIO=22
336+ STARTMODE=auto
337 STP=no
338 TYPE=Bridge
339 USERCTL=no"""),
340@@ -931,6 +944,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
341 HWADDR=c0:d6:9f:2c:e8:80
342 NM_CONTROLLED=no
343 ONBOOT=yes
344+ STARTMODE=auto
345 TYPE=Ethernet
346 USERCTL=no"""),
347 'ifcfg-eth0.101': textwrap.dedent("""\
348@@ -949,6 +963,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
349 NM_CONTROLLED=no
350 ONBOOT=yes
351 PHYSDEV=eth0
352+ STARTMODE=auto
353 TYPE=Ethernet
354 USERCTL=no
355 VLAN=yes"""),
356@@ -959,6 +974,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
357 MASTER=bond0
358 NM_CONTROLLED=no
359 ONBOOT=yes
360+ STARTMODE=auto
361 SLAVE=yes
362 TYPE=Ethernet
363 USERCTL=no"""),
364@@ -969,6 +985,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
365 MASTER=bond0
366 NM_CONTROLLED=no
367 ONBOOT=yes
368+ STARTMODE=auto
369 SLAVE=yes
370 TYPE=Ethernet
371 USERCTL=no"""),
372@@ -979,6 +996,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
373 HWADDR=66:bb:9f:2c:e8:80
374 NM_CONTROLLED=no
375 ONBOOT=yes
376+ STARTMODE=auto
377 TYPE=Ethernet
378 USERCTL=no"""),
379 'ifcfg-eth4': textwrap.dedent("""\
380@@ -988,6 +1006,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
381 HWADDR=98:bb:9f:2c:e8:80
382 NM_CONTROLLED=no
383 ONBOOT=yes
384+ STARTMODE=auto
385 TYPE=Ethernet
386 USERCTL=no"""),
387 'ifcfg-eth5': textwrap.dedent("""\
388@@ -996,6 +1015,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
389 HWADDR=98:bb:9f:2c:e8:8a
390 NM_CONTROLLED=no
391 ONBOOT=no
392+ STARTMODE=manual
393 TYPE=Ethernet
394 USERCTL=no""")
395 },
396@@ -1307,6 +1327,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
397 NETMASK1=255.255.255.0
398 NM_CONTROLLED=no
399 ONBOOT=yes
400+ STARTMODE=auto
401 TYPE=Bond
402 USERCTL=no
403 """),
404@@ -1318,6 +1339,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
405 NM_CONTROLLED=no
406 ONBOOT=yes
407 SLAVE=yes
408+ STARTMODE=auto
409 TYPE=Ethernet
410 USERCTL=no
411 """),
412@@ -1334,6 +1356,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
413 NM_CONTROLLED=no
414 ONBOOT=yes
415 SLAVE=yes
416+ STARTMODE=auto
417 TYPE=Ethernet
418 USERCTL=no
419 """),
420@@ -1359,6 +1382,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
421 NETMASK1=255.255.255.0
422 NM_CONTROLLED=no
423 ONBOOT=yes
424+ STARTMODE=auto
425 TYPE=Bond
426 USERCTL=no
427 """),
428@@ -1370,6 +1394,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
429 NM_CONTROLLED=no
430 ONBOOT=yes
431 SLAVE=yes
432+ STARTMODE=auto
433 TYPE=Ethernet
434 USERCTL=no
435 """),
436@@ -1392,6 +1417,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
437 NM_CONTROLLED=no
438 ONBOOT=yes
439 SLAVE=yes
440+ STARTMODE=auto
441 TYPE=Ethernet
442 USERCTL=no
443 """),
444@@ -1429,6 +1455,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
445 HWADDR=aa:bb:cc:dd:e8:00
446 NM_CONTROLLED=no
447 ONBOOT=yes
448+ STARTMODE=auto
449 TYPE=Ethernet
450 USERCTL=no"""),
451 'ifcfg-en0.99': textwrap.dedent("""\
452@@ -1447,6 +1474,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
453 NM_CONTROLLED=no
454 ONBOOT=yes
455 PHYSDEV=en0
456+ STARTMODE=auto
457 TYPE=Ethernet
458 USERCTL=no
459 VLAN=yes"""),
460@@ -1488,6 +1516,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
461 NM_CONTROLLED=no
462 ONBOOT=yes
463 PRIO=22
464+ STARTMODE=auto
465 STP=no
466 TYPE=Bridge
467 USERCTL=no
468@@ -1501,6 +1530,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
469 IPV6INIT=yes
470 NM_CONTROLLED=no
471 ONBOOT=yes
472+ STARTMODE=auto
473 TYPE=Ethernet
474 USERCTL=no
475 """),
476@@ -1513,6 +1543,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
477 IPV6INIT=yes
478 NM_CONTROLLED=no
479 ONBOOT=yes
480+ STARTMODE=auto
481 TYPE=Ethernet
482 USERCTL=no
483 """),
484@@ -1587,6 +1618,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
485 NETMASK=255.255.255.0
486 NM_CONTROLLED=no
487 ONBOOT=no
488+ STARTMODE=manual
489 TYPE=Ethernet
490 USERCTL=no
491 """),
492@@ -1597,6 +1629,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
493 MTU=1480
494 NM_CONTROLLED=no
495 ONBOOT=yes
496+ STARTMODE=auto
497 TYPE=Ethernet
498 USERCTL=no
499 """),
500@@ -1606,6 +1639,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
501 HWADDR=52:54:00:12:34:ff
502 NM_CONTROLLED=no
503 ONBOOT=no
504+ STARTMODE=manual
505 TYPE=Ethernet
506 USERCTL=no
507 """),
508@@ -1973,6 +2007,7 @@ DEVICE=eth1000
509 HWADDR=07-1C-C6-75-A4-BE
510 NM_CONTROLLED=no
511 ONBOOT=yes
512+STARTMODE=auto
513 TYPE=Ethernet
514 USERCTL=no
515 """.lstrip()
516@@ -2094,6 +2129,7 @@ IPADDR=10.0.2.15
517 NETMASK=255.255.255.0
518 NM_CONTROLLED=no
519 ONBOOT=yes
520+STARTMODE=auto
521 TYPE=Ethernet
522 USERCTL=no
523 """
524@@ -2119,6 +2155,7 @@ BOOTPROTO=dhcp
525 DEVICE=eth0
526 NM_CONTROLLED=no
527 ONBOOT=yes
528+STARTMODE=auto
529 TYPE=Ethernet
530 USERCTL=no
531 """
532@@ -2335,6 +2372,7 @@ DEVICE=eth1000
533 HWADDR=07-1C-C6-75-A4-BE
534 NM_CONTROLLED=no
535 ONBOOT=yes
536+STARTMODE=auto
537 TYPE=Ethernet
538 USERCTL=no
539 """.lstrip()
540@@ -2456,6 +2494,7 @@ IPADDR=10.0.2.15
541 NETMASK=255.255.255.0
542 NM_CONTROLLED=no
543 ONBOOT=yes
544+STARTMODE=auto
545 TYPE=Ethernet
546 USERCTL=no
547 """
548@@ -2481,6 +2520,7 @@ BOOTPROTO=dhcp
549 DEVICE=eth0
550 NM_CONTROLLED=no
551 ONBOOT=yes
552+STARTMODE=auto
553 TYPE=Ethernet
554 USERCTL=no
555 """

Subscribers

People subscribed via source and target branches