Merge lp:~smoser/maas-images/trunk.centos-curtin-passthrough into lp:maas-images

[Scott Moser]

Add support to CentOS 6 and 7 for network config and cloudconfig.

This adds the ability for the CentOS curthooks to make use of
the 'centos_apply_network_config' function of new curtin version.

Also adds the ability to handle 'cloudconfig' entries in curtin config
dictionary. It does this by utilizing 'write_files' from curtin.futil.

It also adds a short term legacy-curtin fallback for older curtin
import paths.

[lp:~smoser/maas-images/trunk.centos-curtin-passthrough]

378. By Scott Moser on 2017-07-28

fix calling of write_files from handle_cloudconfig

[Lee Trager (ltrager)]

Thanks for helping with the Curtin hooks. I have two fixes below. If Curtin trunk lands the final names before this we can just use the final names and drop the backwards compatibility.

review: Needs Fixing

[Scott Moser (smoser)]

I think we'll plan to merge the curtin updates in https://code.launchpad.net/~smoser/curtin/trunk.renames-for-centos/+merge/328250
and then drop the FIXME sections of this, providing no compatibility for curtin at revno 511-513.

[lp:~smoser/maas-images/trunk.centos-curtin-passthrough]

379. By Scott Moser on 2017-08-01

drop support for curtin at versions 511-513.

Curtin at revno 514 now has the renamed import paths.
This breaks support for maas images using a curtin at
revisions 511-513 by dropping the FIXME fallback import paths.

380. By Scott Moser on 2017-08-01

do not name the import error as it was anot used

[Scott Moser (smoser)]

https://code.launchpad.net/~smoser/curtin/trunk.renames-for-centos/+merge/328250
is merged now.
and here i've removed the support for those older curtin revnos (511-513).

[Lee Trager (ltrager)]

LGTM, thanks again for the help!

review: Approve

=== modified file 'curtin/centos6/curtin-hooks.py'
--- curtin/centos6/curtin-hooks.py	2016-05-11 18:47:46 +0000
+++ curtin/centos6/curtin-hooks.py	2017-08-01 15:59:28 +0000
@@ -13,9 +13,28 @@
 
 from curtin import (
     block,
+    config,
     util,
     )
 
+try:
+    from curtin import FEATURES as curtin_features
+except ImportError:
+    curtin_features = []
+
+write_files = None
+try:
+    from curtin.futil import write_files
+except ImportError:
+    pass
+
+centos_apply_network_config = None
+try:
+    if 'CENTOS_APPLY_NETWORK_CONFIG' in curtin_features:
+        from curtin.commands.curthooks import centos_apply_network_config
+except ImportError:
+    pass
+
 """
 CentOS 6
 
@@ -309,6 +328,30 @@
         })
 
 
+def apply_networking(cfg, target, bootmac):
+    if 'network' in cfg and centos_apply_network_config:
+        centos_apply_network_config(cfg, target)
+        return
+
+    if 'network' in cfg:
+        sys.stderr.write("WARN: network configuration provided, but "
+                         "no support for applying. Using basic config.")
+    write_network_config(target, bootmac)
+
+
+def handle_cloudconfig(cfg, target):
+    if not cfg.get('cloudconfig'):
+        return
+    if not write_files:
+        sys.stderr.write(
+            "WARN: Unable to handle 'cloudconfig' section in config."
+            "No 'write_files' found from curtin.\n")
+        return
+
+    base_dir = os.path.join(target, 'etc/cloud/cloud.cfg.d')
+    write_files(cfg['cloudconfig'], base_dir)
+
+
 def main():
     state = util.load_command_environment()
     target = state['target']
@@ -335,7 +378,15 @@
     grub_install(target, grub_root)
 
     set_autorelabel(target)
-    write_network_config(target, bootmac)
+
+    if state.get('config'):
+        cfg = config.load_config(state['config'])
+    else:
+        cfg = {}
+
+    handle_cloudconfig(cfg, target)
+
+    apply_networking(cfg, target, bootmac)
 
 
 if __name__ == "__main__":
 
=== modified file 'curtin/centos7/curtin-hooks.py'
--- curtin/centos7/curtin-hooks.py	2017-05-08 00:04:25 +0000
+++ curtin/centos7/curtin-hooks.py	2017-08-01 15:59:28 +0000
@@ -13,9 +13,27 @@
 
 from curtin import (
     block,
+    config,
     util,
     )
 
+try:
+    from curtin import FEATURES as curtin_features
+except ImportError:
+    curtin_features = []
+
+write_files = None
+try:
+    from curtin.futil import write_files
+except ImportError:
+    pass
+
+centos_apply_network_config = None
+try:
+    if 'CENTOS_APPLY_NETWORK_CONFIG' in curtin_features:
+        from curtin.commands.curthooks import centos_apply_network_config
+except ImportError:
+    pass
 
 """
 CentOS 7
@@ -299,6 +317,30 @@
         })
 
 
+def apply_networking(cfg, target, bootmac):
+    if 'network' in cfg and centos_apply_network_config:
+        centos_apply_network_config(cfg, target)
+        return
+
+    if 'network' in cfg:
+        sys.stderr.write("WARN: network configuration provided, but "
+                         "no support for applying. Using basic config.")
+    write_network_config(target, bootmac)
+
+
+def handle_cloudconfig(cfg, target):
+    if not cfg.get('cloudconfig'):
+        return
+    if not write_files:
+        sys.stderr.write(
+            "WARN: Unable to handle 'cloudconfig' section in config."
+            "No 'write_files' found from curtin.\n")
+        return
+
+    base_dir = os.path.join(target, 'etc/cloud/cloud.cfg.d')
+    write_files(cfg['cloudconfig'], base_dir)
+
+
 def main():
     state = util.load_command_environment()
     target = state['target']
@@ -330,7 +372,15 @@
             grub2_install(target, dev)
 
     set_autorelabel(target)
-    write_network_config(target, bootmac)
+
+    if state.get('config'):
+        cfg = config.load_config(state['config'])
+    else:
+        cfg = {}
+
+    handle_cloudconfig(cfg, target)
+
+    apply_networking(cfg, target, bootmac)
 
 
 if __name__ == "__main__":