merge with trunk.

test runs to the point where it did, think I got most of the changes
incorporated.

1 files changed, 3 insertions, 2 deletions

diff --git a/cloudinit/stages.py b/cloudinit/stages.py
index 5756e74d..47deac6e 100644
--- a/cloudinit/stages.py
+++ b/cloudinit/stages.py
@@ -44,6 +44,7 @@ from cloudinit import helpers
 from cloudinit import importer
 from cloudinit import log as logging
 from cloudinit import net
+from cloudinit.net import cmdline
 from cloudinit.reporting import events
 from cloudinit import sources
 from cloudinit import type_utils
@@ -612,13 +613,13 @@ class Init(object):
         if os.path.exists(disable_file):
             return (None, disable_file)
 
-        cmdline_cfg = ('cmdline', net.read_kernel_cmdline_config())
+        cmdline_cfg = ('cmdline', cmdline.read_kernel_cmdline_config())
         dscfg = ('ds', None)
         if self.datasource and hasattr(self.datasource, 'network_config'):
             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)