summaryrefslogtreecommitdiff
path: root/cloudinit/stages.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-08-23 16:48:40 -0400
committerScott Moser <smoser@brickies.net>2016-08-23 16:48:40 -0400
commitc1da72b7cb855d6ead63cbfc555514963283c38b (patch)
tree692e3db6133d2bea326c4ec8d70b5932b91e2d6c /cloudinit/stages.py
parentd269e3c782f13795b00e72413d5be43e7173465f (diff)
parent210b041b2fead7a57af91f60a6f89d9e5aa1ed4a (diff)
downloadvyos-cloud-init-c1da72b7cb855d6ead63cbfc555514963283c38b.tar.gz
vyos-cloud-init-c1da72b7cb855d6ead63cbfc555514963283c38b.zip
merge trunk at 0.7.7~bzr1192
Diffstat (limited to 'cloudinit/stages.py')
-rw-r--r--cloudinit/stages.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/cloudinit/stages.py b/cloudinit/stages.py
index 143a4fc9..3fbb4443 100644
--- a/cloudinit/stages.py
+++ b/cloudinit/stages.py
@@ -596,7 +596,13 @@ class Init(object):
return
LOG.info("Applying network configuration from %s: %s", src, netcfg)
- return self.distro.apply_network_config(netcfg)
+ try:
+ return self.distro.apply_network_config(netcfg)
+ except NotImplementedError:
+ LOG.warn("distro '%s' does not implement apply_network_config. "
+ "networking may not be configured properly." %
+ self.distro)
+ return
class Modules(object):