summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2016-03-29 13:43:14 -0400
committerScott Moser <smoser@ubuntu.com>2016-03-29 13:43:14 -0400
commit30d8a1f2336f9e05b047136903d47025fdf28f5a (patch)
treeb208e754e58cf15539fca0255fd10012d4583def /bin
parent78c9de871eb2a68da36fb4397fe756b88dc9eb15 (diff)
downloadvyos-cloud-init-30d8a1f2336f9e05b047136903d47025fdf28f5a.tar.gz
vyos-cloud-init-30d8a1f2336f9e05b047136903d47025fdf28f5a.zip
apply_network_config improvements
3 things here: a.) do not raise exception, only warn when trying to apply a network config for a distro that does not have an implementation. This is important since debian/ubuntu is the only one *with* an implementation at the moment b.) apply network config in 'cloud-init --local' even if there is no datasource found. c.) do not write 70-persistent-net.rules the code was writing both 70-persistent-net.rules and /etc/systemd/network/50-cloud-init-*.link files that would just be confusing.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/cloud-init1
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/cloud-init b/bin/cloud-init
index 341359e3..715be4b5 100755
--- a/bin/cloud-init
+++ b/bin/cloud-init
@@ -259,6 +259,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()
if args.local:
return (None, [])
else: