Merge lp:~mpontillo/maas/display-eni-in-install-output into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Include /etc/network/interfaces in installation output.

[Mike Pontillo (mpontillo)]

I triaged this enough to find this workaround, but it would be better if curtin logs this itself.

Depending on verbosity, I think curtin should log both the input network parameters, and the output /etc/network/interfaces file.

review: Disapprove

[Mike Pontillo (mpontillo)]

Related bug: https://bugs.launchpad.net/maas/+bug/1467673

Thanks to Blake's change, I could do:

maas <profile> maas set-config name=curtin_verbose value=true

But this is not much more helpful, as curtin does not log any additional data about how it interprets the network configuration, nor does it log the output /etc/network/interfaces.

=== modified file 'contrib/preseeds_v2/curtin_userdata'
--- contrib/preseeds_v2/curtin_userdata	2015-10-30 16:03:19 +0000
+++ contrib/preseeds_v2/curtin_userdata	2016-01-18 02:44:48 +0000
@@ -15,6 +15,7 @@
 {{endif}}
 late_commands:
   maas: [wget, '--no-proxy', '{{node_disable_pxe_url|escape.shell}}', '--post-data', '{{node_disable_pxe_data|escape.shell}}', '-O', '/dev/null']
+  show_eni: ["curtin", "in-target", "--capture", "--", "/bin/cat", "/etc/network/interfaces"]
 {{if third_party_drivers and driver}}
   driver_00_key_get: curtin in-target -- sh -c "/bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg"
   driver_02_key_add: ["curtin", "in-target", "--", "apt-key", "add", "/tmp/maas-{{driver['package']}}.gpg"]