Merge lp:~smoser/cloud-init/trunk.net-cleanups into lp:~cloud-init-dev/cloud-init/trunk

[Scott Moser]

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. This means that the fallback datasource has
     to get things right.
 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.

[Ryan Harper (raharper)]

LGTM

review: Approve

=== modified file 'bin/cloud-init'
--- bin/cloud-init	2016-03-23 14:31:11 +0000
+++ bin/cloud-init	2016-03-29 17:44:51 +0000
@@ -259,6 +259,7 @@
             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:

=== modified file 'cloudinit/distros/debian.py'
--- cloudinit/distros/debian.py	2016-03-23 15:00:37 +0000
+++ cloudinit/distros/debian.py	2016-03-29 17:44:51 +0000
@@ -82,7 +82,8 @@
         ns = net.parse_net_config_data(netconfig)
         net.render_network_state(target="/", network_state=ns,
                                  eni=self.network_conf_fn,
-                                 links_prefix=self.links_prefix)
+                                 links_prefix=self.links_prefix,
+                                 netrules=None)
         util.del_file("/etc/network/interfaces.d/eth0.cfg")
         return []
 

=== modified file 'cloudinit/stages.py'
--- cloudinit/stages.py	2016-03-24 21:11:26 +0000
+++ cloudinit/stages.py	2016-03-29 17:44:51 +0000
@@ -596,7 +596,13 @@
             return
 
         LOG.info("Applying network configuration from %s: %s", src, netcfg)
-        return self.distro.apply_network_config(netcfg)
+        try:
+            return self.distro.apply_network_config(netcfg)
+        except NotImplementedError:
+            LOG.warn("distro '%s' does not implement apply_network_config. "
+                     "networking may not be configured properly." %
+                     self.distro)
+            return
 
 
 class Modules(object):