summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-05-25 20:36:40 -0400
committerScott Moser <smoser@ubuntu.com>2016-05-25 20:36:40 -0400
commit443df65a45e42c354b8eb7638528970adf036290 (patch)
tree463f1afb73f2d76c5ce1c2d190044a274b7f44c5
parentff56555eccd098e144332aad8faf5ebea5040244 (diff)
downloadvyos-cloud-init-443df65a45e42c354b8eb7638528970adf036290.tar.gz
vyos-cloud-init-443df65a45e42c354b8eb7638528970adf036290.zip
fix bring_up
-rwxr-xr-xbin/cloud-init4
-rw-r--r--cloudinit/stages.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/cloud-init b/bin/cloud-init
index 482b8402..1d421acf 100755
--- a/bin/cloud-init
+++ b/bin/cloud-init
@@ -260,7 +260,7 @@ def main_init(name, args):
util.logexc(LOG, ("No instance datasource found!"
" Likely bad things to come!"))
if not args.force:
- init.apply_network_config()
+ init.apply_network_config(bring_up=not args.local)
if args.local:
return (None, [])
else:
@@ -274,7 +274,7 @@ def main_init(name, args):
# on new instance, apply network config. if not in local mode,
# then we just bring up new networking as the OS has already
# brought up the configured networking.
- init.apply_network_config(bringup=not args.local)
+ init.apply_network_config(bring_up=not args.local)
if args.local and init.datasource.dsmode != sources.DSMODE_LOCAL:
return (init.datasource, [])
diff --git a/cloudinit/stages.py b/cloudinit/stages.py
index 53ebcb45..35eddc3b 100644
--- a/cloudinit/stages.py
+++ b/cloudinit/stages.py
@@ -624,16 +624,16 @@ class Init(object):
return (ncfg, loc)
return (net.generate_fallback_config(), "fallback")
- def apply_network_config(self, bringup):
+ def apply_network_config(self, bring_up):
netcfg, src = self._find_networking_config()
if netcfg is None:
LOG.info("network config is disabled by %s", src)
return
LOG.info("Applying network configuration from %s bringup=%s: %s",
- src, bringup, netcfg)
+ src, bring_up, netcfg)
try:
- return self.distro.apply_network_config(netcfg, bringup=bringup)
+ return self.distro.apply_network_config(netcfg, bring_up=bring_up)
except NotImplementedError:
LOG.warn("distro '%s' does not implement apply_network_config. "
"networking may not be configured properly." %