From 53931ee132f0d236e3ed1b7fd6e0e0b519f40bda Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 15 Apr 2016 13:54:05 -0400 Subject: log that you're not applying config --- bin/cloud-init | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'bin') diff --git a/bin/cloud-init b/bin/cloud-init index b449ac95..5857af32 100755 --- a/bin/cloud-init +++ b/bin/cloud-init @@ -265,10 +265,13 @@ def main_init(name, args): else: return (None, ["No instance datasource found."]) - if args.local and not init.ds_restored: - # if local mode and the datasource was not restored from cache - # (this is not first boot) then apply networking. - init.apply_network_config() + if args.local: + if not init.ds_restored: + # if local mode and the datasource was not restored from cache + # (this is not first boot) then apply networking. + init.apply_network_config() + else: + LOG.debug("skipping networking config from restored datasource.") # Stage 6 iid = init.instancify() -- cgit v1.2.3