Merge lp:~jtv/maas/multi-arch-imports into lp:~maas-maintainers/maas/new-import-script-integration
Status: | Merged |
---|---|
Merged at revision: | 2170 |
Proposed branch: | lp:~jtv/maas/multi-arch-imports |
Merge into: | lp:~maas-maintainers/maas/new-import-script-integration |
Diff against target: |
93 lines (+28/-8) 4 files modified
etc/maas/pserv.yaml (+24/-4) src/provisioningserver/config.py (+1/-1) src/provisioningserver/import_images/boot_resources.py (+2/-2) src/provisioningserver/tests/test_config.py (+1/-1) |
To merge this branch: | bzr merge lp:~jtv/maas/multi-arch-imports |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raphaël Badin (community) | Approve | ||
Review via email: mp+212392@code.launchpad.net |
Commit message
Support multiple architectures in one simplestreams source.
Description of the change
This can be used for good or for evil. Good: specify a single source for completely identical, run-of-the-mill downloads — think “amd64 and oh, all the same stuff for i386 as well please.” Evil: “I want i386/generic plus amd64/hwe-t, but let's just specify them as one source and watch my company's bandwidth crumble under the load of 4 instead of 2 sets of images.”
There's a comment to warn people of the potential for evil. If you specify something like "i386 and armhf, generic and highbank" you probably get just what you'd expect: i386/generic, armhf/generic, armhf/highbank (with the third item actually being just an alias for the second, so bad example). But I'm not too interested in the minutiae right now; when in doubt, specify multiple sources. I think this even comes out clearer than before.
Jeroen
Looks good!
[0]
26 + #
27 + # Be careful: these constraints tend to multiply. For example if you
I'd use another verb here: 'tend' implies that this happens frequently but opens the door for "not always".
[1]
[...] If you only want some of
31 + # those combinations, keep them as separate sources.
Maybe mention that you can also use separate 'selections'.