Merge ~lamont/cloud-init/+git/bug-1621615-device6:master into cloud-init:master

[LaMont Jones]

Add support for 'DEVICE6' and /run/net6-${DEVICE6}.conf

Fixing the original regression in initramfs-tools introduced 'DEVICE6' for IPv6 configuration, as well as /run/net6-${DEVICE6}.conf. This addresses those changes, and is needed for (at least) yakkety to work under MAAS.

[LaMont Jones (lamont)]

Confirmed to work as part of the set (see Bug#1621507) -- this needs to land in zesty, and get backported to yakkety/xenial.

ff71719... by LaMont Jones on 2016-11-02

Incorporate review feedback

[LaMont Jones (lamont)]

Done.

diff --git a/cloudinit/net/cmdline.py b/cloudinit/net/cmdline.py
index 933317d..4075a27 100644
--- a/cloudinit/net/cmdline.py
+++ b/cloudinit/net/cmdline.py
@@ -76,12 +76,13 @@ def _klibc_to_config_entry(content, mac_addrs=None):
 
     data = _load_shell_content(content)
     try:
-        name = data['DEVICE']
+        name = data['DEVICE'] if 'DEVICE' in data else data['DEVICE6']
     except KeyError:
-        raise ValueError("no 'DEVICE' entry in data")
+        raise ValueError("no 'DEVICE' or 'DEVICE6' entry in data")
 
     # ipconfig on precise does not write PROTO
-    proto = data.get('PROTO')
+    # IPv6 config gives us IPV6PROTO, not PROTO.
+    proto = data.get('PROTO', data.get('IPV6PROTO'))
     if not proto:
         if data.get('filename'):
             proto = 'dhcp'