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

Proposed by Chad Smith
Status: Merged
Merged at revision: 7554261566c933a9cfb4f17166069742f1e9fc02
Proposed branch: ~chad.smith/cloud-init:ubuntu/cosmic
Merge into: cloud-init:ubuntu/cosmic
Diff against target: 550 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+362366@code.launchpad.net

Commit message

new upstream snapshot to fix intermittent unittest failure on opennebule. SRU into cosmic

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:7554261566c933a9cfb4f17166069742f1e9fc02
https://jenkins.ubuntu.com/server/job/cloud-init-ci/551/
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/551/rebuild

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/cloudinit/config/cc_rh_subscription.py b/cloudinit/config/cc_rh_subscription.py
index edee01e..28c79b8 100644
--- a/cloudinit/config/cc_rh_subscription.py
+++ b/cloudinit/config/cc_rh_subscription.py
@@ -249,14 +249,14 @@ class SubscriptionManager(object):
249 except util.ProcessExecutionError as e:249 except util.ProcessExecutionError as e:
250 if e.stdout.rstrip() != '':250 if e.stdout.rstrip() != '':
251 for line in e.stdout.split("\n"):251 for line in e.stdout.split("\n"):
252 if line is not '':252 if line != '':
253 self.log_warn(line)253 self.log_warn(line)
254 else:254 else:
255 self.log_warn("Setting the service level failed with: "255 self.log_warn("Setting the service level failed with: "
256 "{0}".format(e.stderr.strip()))256 "{0}".format(e.stderr.strip()))
257 return False257 return False
258 for line in return_out.split("\n"):258 for line in return_out.split("\n"):
259 if line is not "":259 if line != "":
260 self.log.debug(line)260 self.log.debug(line)
261 return True261 return True
262262
@@ -268,7 +268,7 @@ class SubscriptionManager(object):
268 self.log_warn("Auto-attach failed with: {0}".format(e))268 self.log_warn("Auto-attach failed with: {0}".format(e))
269 return False269 return False
270 for line in return_out.split("\n"):270 for line in return_out.split("\n"):
271 if line is not "":271 if line != "":
272 self.log.debug(line)272 self.log.debug(line)
273 return True273 return True
274274
diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
index fd8e501..19b3e60 100644
--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
@@ -273,6 +273,7 @@ class Renderer(renderer.Renderer):
273 ('USERCTL', False),273 ('USERCTL', False),
274 ('NM_CONTROLLED', False),274 ('NM_CONTROLLED', False),
275 ('BOOTPROTO', 'none'),275 ('BOOTPROTO', 'none'),
276 ('STARTMODE', 'auto'),
276 ])277 ])
277278
278 # If these keys exist, then their values will be used to form279 # If these keys exist, then their values will be used to form
@@ -367,6 +368,7 @@ class Renderer(renderer.Renderer):
367 iface_cfg.name))368 iface_cfg.name))
368 if subnet.get('control') == 'manual':369 if subnet.get('control') == 'manual':
369 iface_cfg['ONBOOT'] = False370 iface_cfg['ONBOOT'] = False
371 iface_cfg['STARTMODE'] = 'manual'
370372
371 # set IPv4 and IPv6 static addresses373 # set IPv4 and IPv6 static addresses
372 ipv4_index = -1374 ipv4_index = -1
diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py
index 6e1d04b..02c9a7b 100644
--- a/cloudinit/sources/DataSourceOpenNebula.py
+++ b/cloudinit/sources/DataSourceOpenNebula.py
@@ -337,7 +337,9 @@ def parse_shell_config(content, keylist=None, bash=None, asuser=None,
337 (output, _error) = util.subp(cmd, data=bcmd)337 (output, _error) = util.subp(cmd, data=bcmd)
338338
339 # exclude vars in bash that change on their own or that we used339 # exclude vars in bash that change on their own or that we used
340 excluded = ("EPOCHREALTIME", "RANDOM", "LINENO", "SECONDS", "_", "__v")340 excluded = (
341 "EPOCHREALTIME", "EPOCHSECONDS", "RANDOM", "LINENO", "SECONDS", "_",
342 "__v")
341 preset = {}343 preset = {}
342 ret = {}344 ret = {}
343 target = None345 target = None
diff --git a/debian/changelog b/debian/changelog
index f5bb1fa..4ba478b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,18 @@
1cloud-init (18.5-17-gd1a2fe73-0ubuntu1~18.10.1) cosmic; urgency=medium1cloud-init (18.5-21-g8ee294d5-0ubuntu1~18.10.1) cosmic; urgency=medium
22
3 * New upstream snapshot. (LP: #1813346)3 * New upstream snapshot. (LP: #1813346)
4 - opennebula: also exclude epochseconds from changed environment vars
5 - systemd: Render generator from template to account for system
6 differences. [Robert Schweikert]
7 - sysconfig: On SUSE, use STARTMODE instead of ONBOOT [Robert Schweikert]
8 - flake8: use ==/!= to compare str, bytes, and int literals
9 [Paride Legovini]
10
11 -- Chad Smith <chad.smith@canonical.com> Mon, 28 Jan 2019 20:19:18 -0700
12
13cloud-init (18.5-17-gd1a2fe73-0ubuntu1~18.10.1) cosmic; urgency=medium
14
15 * New upstream snapshot.
4 - opennebula: exclude EPOCHREALTIME as known bash env variable with a16 - opennebula: exclude EPOCHREALTIME as known bash env variable with a
5 delta17 delta
6 - tox: fix disco httpretty dependencies for py3718 - tox: fix disco httpretty dependencies for py37
diff --git a/setup.py b/setup.py
index ea37efc..186e215 100755
--- a/setup.py
+++ b/setup.py
@@ -30,6 +30,8 @@ VARIANT = None
30def is_f(p):30def is_f(p):
31 return os.path.isfile(p)31 return os.path.isfile(p)
3232
33def is_generator(p):
34 return '-generator' in p
3335
34def tiny_p(cmd, capture=True):36def tiny_p(cmd, capture=True):
35 # Darn python 2.6 doesn't have check_output (argggg)37 # Darn python 2.6 doesn't have check_output (argggg)
@@ -90,7 +92,7 @@ def read_requires():
90 return str(deps).splitlines()92 return str(deps).splitlines()
9193
9294
93def render_tmpl(template):95def render_tmpl(template, mode=None):
94 """render template into a tmpdir under same dir as setup.py96 """render template into a tmpdir under same dir as setup.py
9597
96 This is rendered to a temporary directory under the top level98 This is rendered to a temporary directory under the top level
@@ -119,6 +121,8 @@ def render_tmpl(template):
119 VARIANT, template, fpath])121 VARIANT, template, fpath])
120 else:122 else:
121 tiny_p([sys.executable, './tools/render-cloudcfg', template, fpath])123 tiny_p([sys.executable, './tools/render-cloudcfg', template, fpath])
124 if mode:
125 os.chmod(fpath, mode)
122 # return path relative to setup.py126 # return path relative to setup.py
123 return os.path.join(os.path.basename(tmpd), bname)127 return os.path.join(os.path.basename(tmpd), bname)
124128
@@ -138,8 +142,11 @@ INITSYS_FILES = {
138 'systemd': [render_tmpl(f)142 'systemd': [render_tmpl(f)
139 for f in (glob('systemd/*.tmpl') +143 for f in (glob('systemd/*.tmpl') +
140 glob('systemd/*.service') +144 glob('systemd/*.service') +
141 glob('systemd/*.target')) if is_f(f)],145 glob('systemd/*.target'))
142 'systemd.generators': [f for f in glob('systemd/*-generator') if is_f(f)],146 if (is_f(f) and not is_generator(f))],
147 'systemd.generators': [
148 render_tmpl(f, mode=0o755)
149 for f in glob('systemd/*') if is_f(f) and is_generator(f)],
143 'upstart': [f for f in glob('upstart/*') if is_f(f)],150 'upstart': [f for f in glob('upstart/*') if is_f(f)],
144}151}
145INITSYS_ROOTS = {152INITSYS_ROOTS = {
diff --git a/systemd/cloud-init-generator b/systemd/cloud-init-generator.tmpl
146similarity index 90%153similarity index 90%
147rename from systemd/cloud-init-generator154rename from systemd/cloud-init-generator
148rename to systemd/cloud-init-generator.tmpl155rename to systemd/cloud-init-generator.tmpl
index bd9f267..cfa5eb5 100755
--- a/systemd/cloud-init-generator
+++ b/systemd/cloud-init-generator.tmpl
@@ -1,3 +1,4 @@
1## template:jinja
1#!/bin/sh2#!/bin/sh
2set -f3set -f
34
@@ -9,7 +10,11 @@ DISABLE="disabled"
9FOUND="found"10FOUND="found"
10NOTFOUND="notfound"11NOTFOUND="notfound"
11RUN_ENABLED_FILE="$LOG_D/$ENABLE"12RUN_ENABLED_FILE="$LOG_D/$ENABLE"
13{% if variant in ["suse"] %}
14CLOUD_SYSTEM_TARGET="/usr/lib/systemd/system/cloud-init.target"
15{% else %}
12CLOUD_SYSTEM_TARGET="/lib/systemd/system/cloud-init.target"16CLOUD_SYSTEM_TARGET="/lib/systemd/system/cloud-init.target"
17{% endif %}
13CLOUD_TARGET_NAME="cloud-init.target"18CLOUD_TARGET_NAME="cloud-init.target"
14# lxc sets 'container', but lets make that explicitly a global19# lxc sets 'container', but lets make that explicitly a global
15CONTAINER="${container}"20CONTAINER="${container}"
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
index 6e33935..e986b59 100644
--- a/tests/unittests/test_distros/test_netconfig.py
+++ b/tests/unittests/test_distros/test_netconfig.py
@@ -468,6 +468,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
468 NETMASK=255.255.255.0468 NETMASK=255.255.255.0
469 NM_CONTROLLED=no469 NM_CONTROLLED=no
470 ONBOOT=yes470 ONBOOT=yes
471 STARTMODE=auto
471 TYPE=Ethernet472 TYPE=Ethernet
472 USERCTL=no473 USERCTL=no
473 """),474 """),
@@ -476,6 +477,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
476 DEVICE=eth1477 DEVICE=eth1
477 NM_CONTROLLED=no478 NM_CONTROLLED=no
478 ONBOOT=yes479 ONBOOT=yes
480 STARTMODE=auto
479 TYPE=Ethernet481 TYPE=Ethernet
480 USERCTL=no482 USERCTL=no
481 """),483 """),
@@ -499,6 +501,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
499 IPV6_DEFAULTGW=2607:f0d0:1002:0011::1501 IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
500 NM_CONTROLLED=no502 NM_CONTROLLED=no
501 ONBOOT=yes503 ONBOOT=yes
504 STARTMODE=auto
502 TYPE=Ethernet505 TYPE=Ethernet
503 USERCTL=no506 USERCTL=no
504 """),507 """),
@@ -507,6 +510,7 @@ class TestNetCfgDistroRedhat(TestNetCfgDistroBase):
507 DEVICE=eth1510 DEVICE=eth1
508 NM_CONTROLLED=no511 NM_CONTROLLED=no
509 ONBOOT=yes512 ONBOOT=yes
513 STARTMODE=auto
510 TYPE=Ethernet514 TYPE=Ethernet
511 USERCTL=no515 USERCTL=no
512 """),516 """),
@@ -559,6 +563,7 @@ class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
559 NETMASK=255.255.255.0563 NETMASK=255.255.255.0
560 NM_CONTROLLED=no564 NM_CONTROLLED=no
561 ONBOOT=yes565 ONBOOT=yes
566 STARTMODE=auto
562 TYPE=Ethernet567 TYPE=Ethernet
563 USERCTL=no568 USERCTL=no
564 """),569 """),
@@ -567,6 +572,7 @@ class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
567 DEVICE=eth1572 DEVICE=eth1
568 NM_CONTROLLED=no573 NM_CONTROLLED=no
569 ONBOOT=yes574 ONBOOT=yes
575 STARTMODE=auto
570 TYPE=Ethernet576 TYPE=Ethernet
571 USERCTL=no577 USERCTL=no
572 """),578 """),
@@ -587,6 +593,7 @@ class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
587 IPV6_DEFAULTGW=2607:f0d0:1002:0011::1593 IPV6_DEFAULTGW=2607:f0d0:1002:0011::1
588 NM_CONTROLLED=no594 NM_CONTROLLED=no
589 ONBOOT=yes595 ONBOOT=yes
596 STARTMODE=auto
590 TYPE=Ethernet597 TYPE=Ethernet
591 USERCTL=no598 USERCTL=no
592 """),599 """),
@@ -595,6 +602,7 @@ class TestNetCfgDistroOpensuse(TestNetCfgDistroBase):
595 DEVICE=eth1602 DEVICE=eth1
596 NM_CONTROLLED=no603 NM_CONTROLLED=no
597 ONBOOT=yes604 ONBOOT=yes
605 STARTMODE=auto
598 TYPE=Ethernet606 TYPE=Ethernet
599 USERCTL=no607 USERCTL=no
600 """),608 """),
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index 5313d2d..e041e97 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -145,6 +145,7 @@ IPADDR=172.19.1.34
145NETMASK=255.255.252.0145NETMASK=255.255.252.0
146NM_CONTROLLED=no146NM_CONTROLLED=no
147ONBOOT=yes147ONBOOT=yes
148STARTMODE=auto
148TYPE=Ethernet149TYPE=Ethernet
149USERCTL=no150USERCTL=no
150""".lstrip()),151""".lstrip()),
@@ -178,6 +179,7 @@ IPADDR=172.19.1.34
178NETMASK=255.255.252.0179NETMASK=255.255.252.0
179NM_CONTROLLED=no180NM_CONTROLLED=no
180ONBOOT=yes181ONBOOT=yes
182STARTMODE=auto
181TYPE=Ethernet183TYPE=Ethernet
182USERCTL=no184USERCTL=no
183""".lstrip()),185""".lstrip()),
@@ -247,6 +249,7 @@ NETMASK=255.255.252.0
247NETMASK1=255.255.255.0249NETMASK1=255.255.255.0
248NM_CONTROLLED=no250NM_CONTROLLED=no
249ONBOOT=yes251ONBOOT=yes
252STARTMODE=auto
250TYPE=Ethernet253TYPE=Ethernet
251USERCTL=no254USERCTL=no
252""".lstrip()),255""".lstrip()),
@@ -282,6 +285,7 @@ NETMASK=255.255.252.0
282NETMASK1=255.255.255.0285NETMASK1=255.255.255.0
283NM_CONTROLLED=no286NM_CONTROLLED=no
284ONBOOT=yes287ONBOOT=yes
288STARTMODE=auto
285TYPE=Ethernet289TYPE=Ethernet
286USERCTL=no290USERCTL=no
287""".lstrip()),291""".lstrip()),
@@ -373,6 +377,7 @@ IPV6_DEFAULTGW=2001:DB8::1
373NETMASK=255.255.252.0377NETMASK=255.255.252.0
374NM_CONTROLLED=no378NM_CONTROLLED=no
375ONBOOT=yes379ONBOOT=yes
380STARTMODE=auto
376TYPE=Ethernet381TYPE=Ethernet
377USERCTL=no382USERCTL=no
378""".lstrip()),383""".lstrip()),
@@ -410,6 +415,7 @@ IPV6_DEFAULTGW=2001:DB8::1
410NETMASK=255.255.252.0415NETMASK=255.255.252.0
411NM_CONTROLLED=no416NM_CONTROLLED=no
412ONBOOT=yes417ONBOOT=yes
418STARTMODE=auto
413TYPE=Ethernet419TYPE=Ethernet
414USERCTL=no420USERCTL=no
415""".lstrip()),421""".lstrip()),
@@ -526,6 +532,7 @@ NETWORK_CONFIGS = {
526 HWADDR=cf:d6:af:48:e8:80532 HWADDR=cf:d6:af:48:e8:80
527 NM_CONTROLLED=no533 NM_CONTROLLED=no
528 ONBOOT=yes534 ONBOOT=yes
535 STARTMODE=auto
529 TYPE=Ethernet536 TYPE=Ethernet
530 USERCTL=no"""),537 USERCTL=no"""),
531 'ifcfg-eth99': textwrap.dedent("""\538 'ifcfg-eth99': textwrap.dedent("""\
@@ -542,6 +549,7 @@ NETWORK_CONFIGS = {
542 METRIC=10000549 METRIC=10000
543 NM_CONTROLLED=no550 NM_CONTROLLED=no
544 ONBOOT=yes551 ONBOOT=yes
552 STARTMODE=auto
545 TYPE=Ethernet553 TYPE=Ethernet
546 USERCTL=no"""),554 USERCTL=no"""),
547 },555 },
@@ -655,6 +663,7 @@ NETWORK_CONFIGS = {
655 NETMASK=255.255.255.0663 NETMASK=255.255.255.0
656 NM_CONTROLLED=no664 NM_CONTROLLED=no
657 ONBOOT=yes665 ONBOOT=yes
666 STARTMODE=auto
658 TYPE=Ethernet667 TYPE=Ethernet
659 USERCTL=no668 USERCTL=no
660 MTU=9000669 MTU=9000
@@ -694,6 +703,7 @@ NETWORK_CONFIGS = {
694 DEVICE=iface0703 DEVICE=iface0
695 NM_CONTROLLED=no704 NM_CONTROLLED=no
696 ONBOOT=yes705 ONBOOT=yes
706 STARTMODE=auto
697 TYPE=Ethernet707 TYPE=Ethernet
698 USERCTL=no708 USERCTL=no
699 """),709 """),
@@ -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
897 MACADDR=aa:bb:cc:dd:ee:ff907 MACADDR=aa:bb:cc:dd:ee:ff
898 NM_CONTROLLED=no908 NM_CONTROLLED=no
899 ONBOOT=yes909 ONBOOT=yes
910 STARTMODE=auto
900 TYPE=Bond911 TYPE=Bond
901 USERCTL=no"""),912 USERCTL=no"""),
902 'ifcfg-bond0.200': textwrap.dedent("""\913 'ifcfg-bond0.200': textwrap.dedent("""\
@@ -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
905 NM_CONTROLLED=no916 NM_CONTROLLED=no
906 ONBOOT=yes917 ONBOOT=yes
907 PHYSDEV=bond0918 PHYSDEV=bond0
919 STARTMODE=auto
908 TYPE=Ethernet920 TYPE=Ethernet
909 USERCTL=no921 USERCTL=no
910 VLAN=yes"""),922 VLAN=yes"""),
@@ -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
922 NM_CONTROLLED=no934 NM_CONTROLLED=no
923 ONBOOT=yes935 ONBOOT=yes
924 PRIO=22936 PRIO=22
937 STARTMODE=auto
925 STP=no938 STP=no
926 TYPE=Bridge939 TYPE=Bridge
927 USERCTL=no"""),940 USERCTL=no"""),
@@ -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
931 HWADDR=c0:d6:9f:2c:e8:80944 HWADDR=c0:d6:9f:2c:e8:80
932 NM_CONTROLLED=no945 NM_CONTROLLED=no
933 ONBOOT=yes946 ONBOOT=yes
947 STARTMODE=auto
934 TYPE=Ethernet948 TYPE=Ethernet
935 USERCTL=no"""),949 USERCTL=no"""),
936 'ifcfg-eth0.101': textwrap.dedent("""\950 'ifcfg-eth0.101': textwrap.dedent("""\
@@ -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
949 NM_CONTROLLED=no963 NM_CONTROLLED=no
950 ONBOOT=yes964 ONBOOT=yes
951 PHYSDEV=eth0965 PHYSDEV=eth0
966 STARTMODE=auto
952 TYPE=Ethernet967 TYPE=Ethernet
953 USERCTL=no968 USERCTL=no
954 VLAN=yes"""),969 VLAN=yes"""),
@@ -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
959 MASTER=bond0974 MASTER=bond0
960 NM_CONTROLLED=no975 NM_CONTROLLED=no
961 ONBOOT=yes976 ONBOOT=yes
977 STARTMODE=auto
962 SLAVE=yes978 SLAVE=yes
963 TYPE=Ethernet979 TYPE=Ethernet
964 USERCTL=no"""),980 USERCTL=no"""),
@@ -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
969 MASTER=bond0985 MASTER=bond0
970 NM_CONTROLLED=no986 NM_CONTROLLED=no
971 ONBOOT=yes987 ONBOOT=yes
988 STARTMODE=auto
972 SLAVE=yes989 SLAVE=yes
973 TYPE=Ethernet990 TYPE=Ethernet
974 USERCTL=no"""),991 USERCTL=no"""),
@@ -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
979 HWADDR=66:bb:9f:2c:e8:80996 HWADDR=66:bb:9f:2c:e8:80
980 NM_CONTROLLED=no997 NM_CONTROLLED=no
981 ONBOOT=yes998 ONBOOT=yes
999 STARTMODE=auto
982 TYPE=Ethernet1000 TYPE=Ethernet
983 USERCTL=no"""),1001 USERCTL=no"""),
984 'ifcfg-eth4': textwrap.dedent("""\1002 'ifcfg-eth4': textwrap.dedent("""\
@@ -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
988 HWADDR=98:bb:9f:2c:e8:801006 HWADDR=98:bb:9f:2c:e8:80
989 NM_CONTROLLED=no1007 NM_CONTROLLED=no
990 ONBOOT=yes1008 ONBOOT=yes
1009 STARTMODE=auto
991 TYPE=Ethernet1010 TYPE=Ethernet
992 USERCTL=no"""),1011 USERCTL=no"""),
993 'ifcfg-eth5': textwrap.dedent("""\1012 'ifcfg-eth5': textwrap.dedent("""\
@@ -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
996 HWADDR=98:bb:9f:2c:e8:8a1015 HWADDR=98:bb:9f:2c:e8:8a
997 NM_CONTROLLED=no1016 NM_CONTROLLED=no
998 ONBOOT=no1017 ONBOOT=no
1018 STARTMODE=manual
999 TYPE=Ethernet1019 TYPE=Ethernet
1000 USERCTL=no""")1020 USERCTL=no""")
1001 },1021 },
@@ -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
1307 NETMASK1=255.255.255.01327 NETMASK1=255.255.255.0
1308 NM_CONTROLLED=no1328 NM_CONTROLLED=no
1309 ONBOOT=yes1329 ONBOOT=yes
1330 STARTMODE=auto
1310 TYPE=Bond1331 TYPE=Bond
1311 USERCTL=no1332 USERCTL=no
1312 """),1333 """),
@@ -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
1318 NM_CONTROLLED=no1339 NM_CONTROLLED=no
1319 ONBOOT=yes1340 ONBOOT=yes
1320 SLAVE=yes1341 SLAVE=yes
1342 STARTMODE=auto
1321 TYPE=Ethernet1343 TYPE=Ethernet
1322 USERCTL=no1344 USERCTL=no
1323 """),1345 """),
@@ -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
1334 NM_CONTROLLED=no1356 NM_CONTROLLED=no
1335 ONBOOT=yes1357 ONBOOT=yes
1336 SLAVE=yes1358 SLAVE=yes
1359 STARTMODE=auto
1337 TYPE=Ethernet1360 TYPE=Ethernet
1338 USERCTL=no1361 USERCTL=no
1339 """),1362 """),
@@ -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
1359 NETMASK1=255.255.255.01382 NETMASK1=255.255.255.0
1360 NM_CONTROLLED=no1383 NM_CONTROLLED=no
1361 ONBOOT=yes1384 ONBOOT=yes
1385 STARTMODE=auto
1362 TYPE=Bond1386 TYPE=Bond
1363 USERCTL=no1387 USERCTL=no
1364 """),1388 """),
@@ -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
1370 NM_CONTROLLED=no1394 NM_CONTROLLED=no
1371 ONBOOT=yes1395 ONBOOT=yes
1372 SLAVE=yes1396 SLAVE=yes
1397 STARTMODE=auto
1373 TYPE=Ethernet1398 TYPE=Ethernet
1374 USERCTL=no1399 USERCTL=no
1375 """),1400 """),
@@ -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
1392 NM_CONTROLLED=no1417 NM_CONTROLLED=no
1393 ONBOOT=yes1418 ONBOOT=yes
1394 SLAVE=yes1419 SLAVE=yes
1420 STARTMODE=auto
1395 TYPE=Ethernet1421 TYPE=Ethernet
1396 USERCTL=no1422 USERCTL=no
1397 """),1423 """),
@@ -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
1429 HWADDR=aa:bb:cc:dd:e8:001455 HWADDR=aa:bb:cc:dd:e8:00
1430 NM_CONTROLLED=no1456 NM_CONTROLLED=no
1431 ONBOOT=yes1457 ONBOOT=yes
1458 STARTMODE=auto
1432 TYPE=Ethernet1459 TYPE=Ethernet
1433 USERCTL=no"""),1460 USERCTL=no"""),
1434 'ifcfg-en0.99': textwrap.dedent("""\1461 'ifcfg-en0.99': textwrap.dedent("""\
@@ -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
1447 NM_CONTROLLED=no1474 NM_CONTROLLED=no
1448 ONBOOT=yes1475 ONBOOT=yes
1449 PHYSDEV=en01476 PHYSDEV=en0
1477 STARTMODE=auto
1450 TYPE=Ethernet1478 TYPE=Ethernet
1451 USERCTL=no1479 USERCTL=no
1452 VLAN=yes"""),1480 VLAN=yes"""),
@@ -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
1488 NM_CONTROLLED=no1516 NM_CONTROLLED=no
1489 ONBOOT=yes1517 ONBOOT=yes
1490 PRIO=221518 PRIO=22
1519 STARTMODE=auto
1491 STP=no1520 STP=no
1492 TYPE=Bridge1521 TYPE=Bridge
1493 USERCTL=no1522 USERCTL=no
@@ -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
1501 IPV6INIT=yes1530 IPV6INIT=yes
1502 NM_CONTROLLED=no1531 NM_CONTROLLED=no
1503 ONBOOT=yes1532 ONBOOT=yes
1533 STARTMODE=auto
1504 TYPE=Ethernet1534 TYPE=Ethernet
1505 USERCTL=no1535 USERCTL=no
1506 """),1536 """),
@@ -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
1513 IPV6INIT=yes1543 IPV6INIT=yes
1514 NM_CONTROLLED=no1544 NM_CONTROLLED=no
1515 ONBOOT=yes1545 ONBOOT=yes
1546 STARTMODE=auto
1516 TYPE=Ethernet1547 TYPE=Ethernet
1517 USERCTL=no1548 USERCTL=no
1518 """),1549 """),
@@ -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
1587 NETMASK=255.255.255.01618 NETMASK=255.255.255.0
1588 NM_CONTROLLED=no1619 NM_CONTROLLED=no
1589 ONBOOT=no1620 ONBOOT=no
1621 STARTMODE=manual
1590 TYPE=Ethernet1622 TYPE=Ethernet
1591 USERCTL=no1623 USERCTL=no
1592 """),1624 """),
@@ -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
1597 MTU=14801629 MTU=1480
1598 NM_CONTROLLED=no1630 NM_CONTROLLED=no
1599 ONBOOT=yes1631 ONBOOT=yes
1632 STARTMODE=auto
1600 TYPE=Ethernet1633 TYPE=Ethernet
1601 USERCTL=no1634 USERCTL=no
1602 """),1635 """),
@@ -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
1606 HWADDR=52:54:00:12:34:ff1639 HWADDR=52:54:00:12:34:ff
1607 NM_CONTROLLED=no1640 NM_CONTROLLED=no
1608 ONBOOT=no1641 ONBOOT=no
1642 STARTMODE=manual
1609 TYPE=Ethernet1643 TYPE=Ethernet
1610 USERCTL=no1644 USERCTL=no
1611 """),1645 """),
@@ -1973,6 +2007,7 @@ DEVICE=eth1000
1973HWADDR=07-1C-C6-75-A4-BE2007HWADDR=07-1C-C6-75-A4-BE
1974NM_CONTROLLED=no2008NM_CONTROLLED=no
1975ONBOOT=yes2009ONBOOT=yes
2010STARTMODE=auto
1976TYPE=Ethernet2011TYPE=Ethernet
1977USERCTL=no2012USERCTL=no
1978""".lstrip()2013""".lstrip()
@@ -2094,6 +2129,7 @@ IPADDR=10.0.2.15
2094NETMASK=255.255.255.02129NETMASK=255.255.255.0
2095NM_CONTROLLED=no2130NM_CONTROLLED=no
2096ONBOOT=yes2131ONBOOT=yes
2132STARTMODE=auto
2097TYPE=Ethernet2133TYPE=Ethernet
2098USERCTL=no2134USERCTL=no
2099"""2135"""
@@ -2119,6 +2155,7 @@ BOOTPROTO=dhcp
2119DEVICE=eth02155DEVICE=eth0
2120NM_CONTROLLED=no2156NM_CONTROLLED=no
2121ONBOOT=yes2157ONBOOT=yes
2158STARTMODE=auto
2122TYPE=Ethernet2159TYPE=Ethernet
2123USERCTL=no2160USERCTL=no
2124"""2161"""
@@ -2335,6 +2372,7 @@ DEVICE=eth1000
2335HWADDR=07-1C-C6-75-A4-BE2372HWADDR=07-1C-C6-75-A4-BE
2336NM_CONTROLLED=no2373NM_CONTROLLED=no
2337ONBOOT=yes2374ONBOOT=yes
2375STARTMODE=auto
2338TYPE=Ethernet2376TYPE=Ethernet
2339USERCTL=no2377USERCTL=no
2340""".lstrip()2378""".lstrip()
@@ -2456,6 +2494,7 @@ IPADDR=10.0.2.15
2456NETMASK=255.255.255.02494NETMASK=255.255.255.0
2457NM_CONTROLLED=no2495NM_CONTROLLED=no
2458ONBOOT=yes2496ONBOOT=yes
2497STARTMODE=auto
2459TYPE=Ethernet2498TYPE=Ethernet
2460USERCTL=no2499USERCTL=no
2461"""2500"""
@@ -2481,6 +2520,7 @@ BOOTPROTO=dhcp
2481DEVICE=eth02520DEVICE=eth0
2482NM_CONTROLLED=no2521NM_CONTROLLED=no
2483ONBOOT=yes2522ONBOOT=yes
2523STARTMODE=auto
2484TYPE=Ethernet2524TYPE=Ethernet
2485USERCTL=no2525USERCTL=no
2486"""2526"""

Subscribers

People subscribed via source and target branches