Merge lp:~ltrager/maas/xenial_default into lp:~maas-committers/maas/trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Lee Trager | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 4887 | ||||
Proposed branch: | lp:~ltrager/maas/xenial_default | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
338 lines (+47/-31) 19 files modified
README (+1/-1) docs/_static/versions.js (+1/-1) docs/about.rst (+3/-3) docs/bootsources.rst (+1/-1) docs/index.rst (+1/-1) docs/sstreams-mirror.rst (+1/-1) src/maascli/parser.py (+1/-1) src/maasserver/bootresources.py (+4/-4) src/maasserver/bootsources.py (+6/-3) src/maasserver/enum.py (+1/-1) src/maasserver/forms.py (+1/-1) src/maasserver/models/tests/test_bootresourceset.py (+1/-1) src/maasserver/testing/factory.py (+1/-1) src/maasserver/tests/test_bootresources.py (+1/-1) src/maasserver/tests/test_bootsources.py (+4/-4) src/provisioningserver/config.py (+1/-1) src/provisioningserver/drivers/osystem/tests/test_ubuntu.py (+7/-2) src/provisioningserver/drivers/osystem/ubuntu.py (+10/-2) src/provisioningserver/import_images/tests/test_download_resources.py (+1/-1) |
||||
To merge this branch: | bzr merge lp:~ltrager/maas/xenial_default | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email: mp+291210@code.launchpad.net |
Commit message
Set Xenial as the default image and commissioing release. Set images.maas.io as the default simplestream.
Description of the change
The default commissioning release and image to deploy are both set by looking at what UbuntuOS.lts() is set to. This is a child class of UbuntuDistroInfo, an external package. Because Xenial isn't released yet its still showing trusty. I modified UbuntuOS to return Xenial for now, once Xenial is released we can remove this work around. The default image was actually hard coded so I modified it to also get its data from UbuntuOS.
I also noticed that the default simplestream was still set to maas.ubuntu.com, which redirects to images.maas.io. I set the default stream to https:/
Looks good. Thanks for fixing the import url.