maas-images

Merge lp:~smoser/maas-images/trunk.fix-apply-networking into lp:maas-images

  1. trunk.fix-apply-networking
  2. Merge into maas-ephemerals
Proposed by Scott Moser
Status: Merged
Merged at revision: 379
Proposed branch: lp:~smoser/maas-images/trunk.fix-apply-networking
Merge into: lp:maas-images
Diff against target: 25 lines (+2/-2)
2 files modified
curtin/centos6/curtin-hooks.py (+1/-1)
curtin/centos7/curtin-hooks.py (+1/-1)
To merge this branch: bzr merge lp:~smoser/maas-images/trunk.fix-apply-networking
Reviewer Review Type Date Requested Status
Lee Trager (community) Approve
Andres Rodriguez (community) Approve
Review via email: mp+328467@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve
Revision history for this message
Lee Trager (ltrager) wrote :

Tested with generated stream at http://162.213.35.187/centos_networking/

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'curtin/centos6/curtin-hooks.py'
2--- curtin/centos6/curtin-hooks.py 2017-08-01 15:58:24 +0000
3+++ curtin/centos6/curtin-hooks.py 2017-08-02 19:22:30 +0000
4@@ -330,7 +330,7 @@
5
6 def apply_networking(cfg, target, bootmac):
7 if 'network' in cfg and centos_apply_network_config:
8- centos_apply_network_config(cfg, target)
9+ centos_apply_network_config(cfg['network'], target)
10 return
11
12 if 'network' in cfg:
13
14=== modified file 'curtin/centos7/curtin-hooks.py'
15--- curtin/centos7/curtin-hooks.py 2017-08-01 15:58:24 +0000
16+++ curtin/centos7/curtin-hooks.py 2017-08-02 19:22:30 +0000
17@@ -319,7 +319,7 @@
18
19 def apply_networking(cfg, target, bootmac):
20 if 'network' in cfg and centos_apply_network_config:
21- centos_apply_network_config(cfg, target)
22+ centos_apply_network_config(cfg['network'], target)
23 return
24
25 if 'network' in cfg:

Subscribers

People subscribed via source and target branches