Merge lp:~rvb/maas/bug-import-eph-crash into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Fix calls to install_image_from_simplestreams in the ephemerals import script: install_image_from_simplestreams() now takes a 'label' parameter.

This is a fallout from https://code.launchpad.net/~jtv/maas/label-level-in-boot-image-dir-tree/+merge/210740. The problem was in an area of the script that is still untested. This is why we didn't see the failure earlier and why this fix doesn't include a test.

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'src/provisioningserver/import_images/ephemerals_script.py'
--- src/provisioningserver/import_images/ephemerals_script.py	2014-03-14 04:24:47 +0000
+++ src/provisioningserver/import_images/ephemerals_script.py	2014-03-19 07:29:38 +0000
@@ -311,11 +311,12 @@
             # right now, although it might some day for HWE
             # kernels.
             install_image_from_simplestreams(
-                target_dir, release=release, arch=arch,
+                target_dir, release=release, label=label, arch=arch,
                 temp_location=self._simplestreams_path())
             if arch == 'armhf':
                 install_image_from_simplestreams(
-                    target_dir, release=release, arch=arch, subarch='highbank',
+                    target_dir, release=release, label=label, arch=arch,
+                    subarch='highbank',
                     temp_location=self._simplestreams_path())
 
             tgt_conf_path = os.path.join(target_dir, 'tgt.conf')