apply networking less often

Do not apply networking configuration whenever a previous datasource
has been loaded from disk and found to be valid (via positive
 return 'check_instance_id' or user configuration of manual_cache_clean).

This effectively means that we apply fallback networking only once
per instance rather than every boot on any datasource with
'check_instance_id' implemented.

LP: #1571004

1 files changed, 6 insertions, 1 deletions

diff --git a/bin/cloud-init b/bin/cloud-init
index 715be4b5..5857af32 100755
--- a/bin/cloud-init
+++ b/bin/cloud-init
@@ -266,7 +266,12 @@ def main_init(name, args):
                 return (None, ["No instance datasource found."])
 
     if args.local:
-        init.apply_network_config()
+        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()