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

[Scott Moser]

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

[Lee Trager (ltrager)]

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

review: Approve

=== modified file 'curtin/centos6/curtin-hooks.py'
--- curtin/centos6/curtin-hooks.py	2017-08-01 15:58:24 +0000
+++ curtin/centos6/curtin-hooks.py	2017-08-02 19:22:30 +0000
@@ -330,7 +330,7 @@
 
 def apply_networking(cfg, target, bootmac):
     if 'network' in cfg and centos_apply_network_config:
-        centos_apply_network_config(cfg, target)
+        centos_apply_network_config(cfg['network'], target)
         return
 
     if 'network' in cfg:
 
=== modified file 'curtin/centos7/curtin-hooks.py'
--- curtin/centos7/curtin-hooks.py	2017-08-01 15:58:24 +0000
+++ curtin/centos7/curtin-hooks.py	2017-08-02 19:22:30 +0000
@@ -319,7 +319,7 @@
 
 def apply_networking(cfg, target, bootmac):
     if 'network' in cfg and centos_apply_network_config:
-        centos_apply_network_config(cfg, target)
+        centos_apply_network_config(cfg['network'], target)
         return
 
     if 'network' in cfg: