Scott Moser has proposed merging lp:~smoser/cloud-init/trunk.1590104 into lp:cloud-init.
Requested reviews: cloud init development team (cloud-init-dev) Related bugs: Bug #1590104 in cloud-init: "network config from datasource overrides network config from system" https://bugs.launchpad.net/cloud-init/+bug/1590104 For more details, see: https://code.launchpad.net/~smoser/cloud-init/trunk.1590104/+merge/296711 -- Your team cloud init development team is requested to review the proposed merge of lp:~smoser/cloud-init/trunk.1590104 into lp:cloud-init.
=== modified file 'cloudinit/stages.py' --- cloudinit/stages.py 2016-06-01 21:17:11 +0000 +++ cloudinit/stages.py 2016-06-07 18:37:57 +0000 @@ -618,7 +618,7 @@ dscfg = ('ds', self.datasource.network_config) sys_cfg = ('system_cfg', self.cfg.get('network')) - for loc, ncfg in (cmdline_cfg, dscfg, sys_cfg): + for loc, ncfg in (cmdline_cfg, sys_cfg, dscfg): if net.is_disabled_cfg(ncfg): LOG.debug("network config disabled by %s", loc) return (None, loc)
_______________________________________________ Mailing list: https://launchpad.net/~cloud-init-dev Post to : cloud-init-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~cloud-init-dev More help : https://help.launchpad.net/ListHelp