cloud-init-dev team mailing list archive

[Lars Kellogg-Stedman <lars@xxxxxxxxxx>]

Lars Kellogg-Stedman has proposed merging ~larsks/cloud-init:lp/1665441 into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1665441 in cloud-init: "cloudinit/net/sysconfig.py does not parse network_data.json correctly"
  https://bugs.launchpad.net/cloud-init/+bug/1665441

For more details, see:
https://code.launchpad.net/~larsks/cloud-init/+git/cloud-init/+merge/317553

This corrects the problem reported in #1665441. The resulting files are incompatible with NetworkManager, but will work correctly in a legacy networking environment.
-- 
Your team cloud init development team is requested to review the proposed merge of ~larsks/cloud-init:lp/1665441 into cloud-init:master.

diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
index 9be7407..19e220a 100644
--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
@@ -283,10 +283,10 @@ class Renderer(renderer.Renderer):
                 cls._render_subnet(iface_cfg, route_cfg, iface_subnets[0])
             elif len(iface_subnets) > 1:
                 for i, iface_subnet in enumerate(iface_subnets,
-                                                 start=len(iface.children)):
+                                                 start=len(iface_cfg.children)):
                     iface_sub_cfg = iface_cfg.copy()
                     iface_sub_cfg.name = "%s:%s" % (iface_name, i)
-                    iface.children.append(iface_sub_cfg)
+                    iface_cfg.children.append(iface_sub_cfg)
                     cls._render_subnet(iface_sub_cfg, route_cfg, iface_subnet)
 
     @classmethod