Merge lp://staging/~boyang-niu/maas/enable_custom_images into lp://staging/~maas-committers/maas/trunk
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~boyang-niu/maas/enable_custom_images |
Merge into: | lp://staging/~maas-committers/maas/trunk |
Diff against target: |
865 lines (+401/-48) 16 files modified
src/maasserver/forms.py (+84/-12) src/maasserver/forms_settings.py (+13/-10) src/maasserver/models/bootimage.py (+40/-5) src/maasserver/models/config.py (+2/-3) src/maasserver/models/node.py (+3/-4) src/maasserver/templates/maasserver/boot_image_confirm_delete.html (+23/-0) src/maasserver/templates/maasserver/bootimage.html (+26/-0) src/maasserver/templates/maasserver/settings.html (+4/-0) src/maasserver/templates/maasserver/settings_boot_images.html (+37/-0) src/maasserver/tests/test_forms.py (+59/-0) src/maasserver/urls.py (+7/-0) src/maasserver/views/settings.py (+82/-0) src/maasserver/views/settings_clusters.py (+1/-1) src/provisioningserver/pxe/config.py (+9/-6) src/provisioningserver/pxe/tests/test_config.py (+10/-6) src/provisioningserver/tests/test_tftp.py (+1/-1) |
To merge this branch: | bzr merge lp://staging/~boyang-niu/maas/enable_custom_images |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Julian Edwards (community) | Needs Resubmitting | ||
Review via email: mp+169074@code.staging.launchpad.net |
This proposal has been superseded by a proposal from 2013-07-09.
Commit message
Enabled custom images during installation and commissioning.
Description of the change
Users are now able to put custom images into /var/lib/
In maasserver/enum.py, DISTRO_SERIES is automated and searches through the tftp_root to look for any releases that are available. It then zips the folder name into the enum. Before, this was hardcoded as the three ubuntu release names and matched with the folder names in tftp_root.
Unmerged revisions
- 1544. By Boyang Niu
-
changed the display name for images in form selection to be more detailed
- 1543. By Boyang Niu
-
style changes in order to make maas linter happy
- 1542. By Boyang Niu
-
added boot image creation/deletion forms, testing for custom images, and removed usage of distro_series enum
- 1541. By Boyang Niu
-
merged from trunk
- 1540. By Boyang Niu
-
Added boot image UI and file-writing support
- 1539. By Boyang Niu
-
merged conflicts with 1.3
- 1538. By Boyang Niu
-
replaced hardcoding of releases enum
Hi there Boyang,
Thanks for your submission, this is the first community-submitted patch, congratulations!
Just a few quick pre-review comments:
1. You have conflicts; the template stuff has changed recently so that it all moved to separate template files
2. Your solution to auto-enumerate releases won't work in a development environment as it hard-codes the path. This is also bad because it assumes packaging knowledge of installation locations. Ultimately we want to get rid of this enum and possibly store the available distros in a new database table, which will be populated by using distro-info.
3. All functionality needs tests and this branch has no new tests. We can help you out with that though.
4. I'm not sure if you talked to anyone about how to approach this but ideally we'd make this driven through the UI a bit more. We need to be able to specify custom images on a per-node basis as well as this global solution. Also I think it would be better to configure additional custom image locations via the API/UI. It would also be nice to have a way of making sure the images are consistent across different clusters (but that's not strictly necessary up front).
So at the moment this can't land at least because of (1), (2) and (3). (4) is quite a lot of work so it's something that can be added later by anyone.
Also it looks like your branch is based off the 1.3 release and this MP is targeting trunk. You need to apply your revisions to a trunk-based branch instead, so I shall mark this as "resubmit" because of that.