lp:~julian-edwards/maas/backport-r1371
Created by
Julian Edwards
and last modified
Only
Julian Edwards
can upload to this branch. If you are
Julian Edwards
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Julian Edwards (community): Approve
-
Diff: 1902 lines (+939/-246)30 files modifiedsrc/maasserver/api.py (+17/-7)
src/maasserver/compose_preseed.py (+9/-6)
src/maasserver/dhcp.py (+1/-9)
src/maasserver/dns.py (+3/-4)
src/maasserver/fields.py (+1/-25)
src/maasserver/migrations/0045_add_tag_kernel_opts.py (+203/-0)
src/maasserver/migrations/0046_add_nodegroup_maas_url.py (+205/-0)
src/maasserver/models/nodegroup.py (+5/-0)
src/maasserver/preseed.py (+70/-37)
src/maasserver/server_address.py (+17/-11)
src/maasserver/templates/maasserver/enlist_preseed.html (+1/-0)
src/maasserver/testing/factory.py (+2/-1)
src/maasserver/tests/test_api.py (+143/-2)
src/maasserver/tests/test_dhcp.py (+16/-5)
src/maasserver/tests/test_dns.py (+12/-1)
src/maasserver/tests/test_fields.py (+0/-47)
src/maasserver/tests/test_forms.py (+0/-8)
src/maasserver/tests/test_preseed.py (+53/-15)
src/maasserver/tests/test_server_address.py (+17/-3)
src/maasserver/tests/test_views_nodes.py (+16/-0)
src/maasserver/utils/__init__.py (+27/-14)
src/maasserver/utils/tests/test_utils.py (+63/-40)
src/maasserver/views/nodes.py (+9/-1)
src/maastesting/factory.py (+7/-0)
src/metadataserver/api.py (+7/-2)
src/metadataserver/tests/test_api.py (+35/-2)
src/provisioningserver/dhcp/tests/test_config.py (+0/-2)
src/provisioningserver/tests/test_auth.py (+0/-2)
src/provisioningserver/tests/test_start_cluster_controller.py (+0/-1)
src/provisioningserver/tests/test_tasks.py (+0/-1)
Related bugs
Bug #1081696: The value of 'domain-name-servers' in the dhcp config is wrong. | Critical | Fix Released | |
Bug #1081701: The metadata address mentioned in the preseed is wrong. | Critical | Fix Released |
Related blueprints
Branch information
Recent revisions
This branch has not been scanned yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~maas-committers/maas/trunk