diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-22 20:02:29 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-22 20:02:29 -0400 |
| commit | ed55d6bac52c53b9473b9644ce50f61404bfd438 (patch) | |
| tree | c1cfa354d97e582308902f1af8a6bd2b8a26534b | |
| parent | 7f0871dc5b141ff4bf601b6d96021eba8a3bb0ec (diff) | |
| download | vyos-cloud-init-ed55d6bac52c53b9473b9644ce50f61404bfd438.tar.gz vyos-cloud-init-ed55d6bac52c53b9473b9644ce50f61404bfd438.zip | |
better log message about applying networking.
| -rw-r--r-- | cloudinit/stages.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cloudinit/stages.py b/cloudinit/stages.py index 73090025..8ebbe6a9 100644 --- a/cloudinit/stages.py +++ b/cloudinit/stages.py @@ -578,18 +578,18 @@ class Init(object): for loc, ncfg in (cmdline_cfg, dscfg, sys_cfg): if net.is_disabled_cfg(ncfg): LOG.debug("network config disabled by %s", loc) - return None + return (None, loc) if ncfg: - return ncfg - return net.generate_fallback_config() + return (ncfg, loc) + return (net.generate_fallback_config(), "fallback") def apply_network_config(self): - netcfg = self._find_networking_config() + netcfg, src = self._find_networking_config() if netcfg is None: - LOG.info("network config is disabled") + LOG.info("network config is disabled by %s", src) return - LOG.info("Applying configuration: %s", netcfg) + LOG.info("Applying network configuration from %s: %s", src, netcfg) return self.distro.apply_network_config(netcfg) |