summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorWesley Wiedenmeier <wesley.wiedenmeier@gmail.com>2016-03-22 01:24:01 -0500
committerWesley Wiedenmeier <wesley.wiedenmeier@gmail.com>2016-03-22 01:24:01 -0500
commit88bfbe22a2f1128f358501bc10f5a2cbd1f7facf (patch)
tree9ad8c61c67c9f260f1deffce027d86df27f082a5 /bin
parent7e399773a95e21e4c825dab61847d6abcd2aa511 (diff)
downloadvyos-cloud-init-88bfbe22a2f1128f358501bc10f5a2cbd1f7facf.tar.gz
vyos-cloud-init-88bfbe22a2f1128f358501bc10f5a2cbd1f7facf.zip
Basic code added to kick off network configuration and cause fallback network
configuration to be run if there is no network configuration provided by the datasource. NOTE: the code added here will not behave correctly if a net datasource has network configuration. this code is temporary and should be reverted once support for network configuration for net datasources after retrieving config is in place. based on: http://paste.ubuntu.com/15443576/ With this in place cloud-init properly chooses a fallback interface, configures it and brings it online
Diffstat (limited to 'bin')
-rwxr-xr-xbin/cloud-init2
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/cloud-init b/bin/cloud-init
index f101a713..2dfa8ec7 100755
--- a/bin/cloud-init
+++ b/bin/cloud-init
@@ -251,6 +251,7 @@ def main_init(name, args):
# Stage 5
try:
init.fetch()
+ init.apply_networking()
except sources.DataSourceNotFoundException:
# In the case of 'cloud-init init' without '--local' it is a bit
# more likely that the user would consider it failure if nothing was
@@ -261,6 +262,7 @@ def main_init(name, args):
else:
util.logexc(LOG, ("No instance datasource found!"
" Likely bad things to come!"))
+ init.apply_networking()
if not args.force:
if args.local:
return (None, [])