lp:~blake-rouse/maas/add-osystem-to-bootimage

Branch merges

Propose for merging

Merged into lp:~maas-committers/maas/trunk at revision 2313

Julian Edwards (community): Approve on 2014-04-24

Diff: 1431 lines (+546/-111)

26 files modified

src/maasserver/api.py (+21/-17)
src/maasserver/migrations/0076_add_osystem_to_bootimage.py (+275/-0)
src/maasserver/models/bootimage.py (+41/-20)
src/maasserver/models/tests/test_bootimage.py (+100/-20)
src/maasserver/preseed.py (+5/-2)
src/maasserver/templates/maasserver/bootimage-list.html (+2/-0)
src/maasserver/testing/factory.py (+6/-3)
src/maasserver/tests/test_api_boot_images.py (+4/-1)
src/maasserver/tests/test_api_pxeconfig.py (+2/-0)
src/maasserver/tests/test_preseed.py (+13/-5)
src/maasserver/views/clusters.py (+2/-2)
src/maasserver/views/tests/test_boot_image_list.py (+1/-2)
src/metadataserver/tests/test_api.py (+1/-0)
src/provisioningserver/boot/__init__.py (+1/-1)
src/provisioningserver/boot/tests/test_pxe.py (+3/-2)
src/provisioningserver/boot/tests/test_tftppath.py (+6/-3)
src/provisioningserver/boot/tests/test_uefi.py (+1/-1)
src/provisioningserver/boot/tftppath.py (+11/-10)
src/provisioningserver/import_images/boot_resources.py (+16/-6)
src/provisioningserver/import_images/download_resources.py (+2/-1)
src/provisioningserver/import_images/tests/test_boot_resources.py (+5/-3)
src/provisioningserver/kernel_opts.py (+12/-4)
src/provisioningserver/rpc/cluster.py (+2/-1)
src/provisioningserver/rpc/tests/test_clusterservice.py (+5/-3)
src/provisioningserver/testing/boot_images.py (+5/-2)
src/provisioningserver/tests/test_kernel_opts.py (+4/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1315160: no support for different operating systems

High

Fix Released

Link a bug report

Related blueprints

2289. By Blake Rouse on 2014-05-02

Fix broken migration.

2288. By Blake Rouse on 2014-05-02

Merge trunk.

2287. By Blake Rouse on 2014-04-24

Added unittest for get_usable_osystems and get_usable_releases. Fixed lint issues.

2286. By Blake Rouse on 2014-04-23

Add osystem to BootImage. When scanning for boot resources its now osystem/arch/subarch/release/label.

2285. By Jeroen T. Vermeulen on 2014-04-23

[r=rvb][bug=][author=jtv] Simple context manager for setting environment variables.

2284. By Raphaël Badin on 2014-04-23

[r=jtv][bug=1308292][author=rvb] Make NodeWithMACAddressesForm/AdminNodeWithMACAddressesForm return more meaningful errors when validation fails.

2283. By Raphaël Badin on 2014-04-23

[r=julian-edwards][bug=1311151][author=rvb] Do not import Trusty's 'rc' images by default.

2282. By Scott Moser on 2014-04-23

[r=jtv][bug=1305282][author=smoser] enlist_userdata: fix issue if dig fails to reach a dns server

dig exits non-zero and writes a failure message to stdout if it fails to
reach dnsserver. If that occurred, we were assigning that output to
the host variable, and then trying to register the node with that host.

The fix here is to only assign host if the dig command was successful.

2281. By Graham Binns on 2014-04-23

[r=gmb][bug=1310846][author=gmb] Make the AMT power template retry failed commands more often, to increase its reliability. Previously, the template would only retry a couple of times.

2280. By Raphaël Badin on 2014-04-23

[r=jtv][bug=1309601][author=rvb] Add '--fail' when using curl in maas-enlist to make maas-enlist report failure when curl gets a 400-type response.