From 88bfbe22a2f1128f358501bc10f5a2cbd1f7facf Mon Sep 17 00:00:00 2001
From: Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com>
Date: Tue, 22 Mar 2016 01:24:01 -0500
Subject: 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
---
 bin/cloud-init                |  2 ++
 cloudinit/sources/__init__.py |  4 ++++
 cloudinit/stages.py           | 11 +++++++++++
 3 files changed, 17 insertions(+)

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, [])
diff --git a/cloudinit/sources/__init__.py b/cloudinit/sources/__init__.py
index d3cfa560..08058762 100644
--- a/cloudinit/sources/__init__.py
+++ b/cloudinit/sources/__init__.py
@@ -217,6 +217,10 @@ class DataSource(object):
     def get_package_mirror_info(self):
         return self.distro.get_package_mirror_info(data_source=self)
 
+    @property
+    def network_config(self):
+        return self.metadata.network_config
+
 
 def normalize_pubkey_data(pubkey_data):
     keys = []
diff --git a/cloudinit/stages.py b/cloudinit/stages.py
index dbcf3d55..d508897b 100644
--- a/cloudinit/stages.py
+++ b/cloudinit/stages.py
@@ -587,6 +587,17 @@ class Init(object):
         # Run the handlers
         self._do_handlers(user_data_msg, c_handlers_list, frequency)
 
+    def apply_networking(self):
+        """Attempt to apply network configuration, either using network
+           configuration from datasource or fallback configuration if that is
+           not available"""
+        if self.datasource and self.datasource.network_config:
+            ds_net_conf = self.datasource.network_config
+            res = self.distro.apply_network_config(ds_net_conf, bring_up=True)
+        else:
+            res = self.distro.apply_fallback_network(bring_up=True)
+        return res
+
 
 class Modules(object):
     def __init__(self, init, cfg_files=None, reporter=None):
-- 
cgit v1.2.3