diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-06-07 16:23:18 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-06-07 16:23:18 -0400 |
| commit | b01cbc0c282ca1bf761d2064f0c96c176ccc93d4 (patch) | |
| tree | a6c57399ebf1afbdcd483f2ce4d4399c133c1dbe | |
| parent | 2268993b5cb770babb995efd5bb799517528b8a4 (diff) | |
| parent | dbeff5c80281ee1c236583d523feb323c7518c19 (diff) | |
| download | vyos-cloud-init-b01cbc0c282ca1bf761d2064f0c96c176ccc93d4.tar.gz vyos-cloud-init-b01cbc0c282ca1bf761d2064f0c96c176ccc93d4.zip | |
make networking config provided in system config override datasource.
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
| -rw-r--r-- | cloudinit/stages.py | 2 |
1 files changed, 1 insertions, 1 deletions
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) |