From dbeff5c80281ee1c236583d523feb323c7518c19 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Tue, 7 Jun 2016 14:34:57 -0400 Subject: system config of networking should override datasource provided while datasource provided networking is more dynamic in most cases, preference should still be given to networking configuration provided in the system. This is because the user of the image should be ultimately in control of the networking configuration if they so choose. LP: #1590104 --- cloudinit/stages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cloudinit') diff --git a/cloudinit/stages.py b/cloudinit/stages.py index 5756e74d..4ba95318 100644 --- a/cloudinit/stages.py +++ b/cloudinit/stages.py @@ -618,7 +618,7 @@ class Init(object): 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) -- cgit v1.2.3