Merge lp:~stgraber/vmbuilder/lxd-metadata into lp:~ubuntu-on-ec2/vmbuilder/automated-ec2-builds

[Stéphane Graber]

This updates the LXD metadata for all images.

It changes the cloud-init seed files to only be generated on create (at smoser's request) and adds a way for LXD to turn off the DHCP client (as needed for the new lxdbr0 bridge).

[Dan Watkins (oddbloke)]

This is the same change as https://code.launchpad.net/~stgraber/cloudware/+git/cpc_build_tools/+merge/289010 so review is happening over there.

[lp:~stgraber/vmbuilder/lxd-metadata]

720. By Dan Watkins on 2016-03-15

lxd_metadata: Make eth0 DHCP configuration, and cloud-init seed generation time change

=== modified file 'lxd_metadata'
--- lxd_metadata	2015-08-11 12:52:57 +0000
+++ lxd_metadata	2016-03-15 05:31:57 +0000
@@ -57,11 +57,11 @@
 templates:
     /var/lib/cloud/seed/nocloud-net/meta-data:
         when:
-            - start
+            - create
         template: cloud-init-meta.tpl
     /var/lib/cloud/seed/nocloud-net/user-data:
         when:
-            - start
+            - create
         template: cloud-init-user.tpl
         properties:
             default: |
@@ -69,12 +69,16 @@
                 {}
     /var/lib/cloud/seed/nocloud-net/vendor-data:
         when:
-            - start
+            - create
         template: cloud-init-vendor.tpl
         properties:
             default: |
                 #cloud-config
                 {}
+    /etc/network/interfaces.d/eth0.cfg:
+        when:
+            - create
+        template: interfaces.tpl
     /etc/init/console.override:
         when:
             - create
@@ -119,4 +123,10 @@
 manual
 EOF
 
+cat > "${TMPL_D}/interfaces.tpl" << EOF
+# The primary network interface
+auto eth0
+iface eth0 inet {% if config_get("user.network_mode", "") == "link-local" %}manual{% else %}dhcp{% endif %}
+EOF
+
 tar --xz -cvf "${DEST}" -C ${TMP_D} metadata.yaml templates