lp:~maas-maintainers/maas/new-import-script-integration
Created by
Raphaƫl Badin
and last modified
Branch merges
Propose for merging
No branches
dependent on this one.
- Jeroen T. Vermeulen (community): Approve
- Graham Binns (community): Approve
-
Diff: 2453 lines (+793/-872)30 files modifiedcontrib/maas-cluster-http.conf (+2/-2)
etc/maas/bootresources.yaml (+62/-0)
etc/maas/import_ephemerals (+2/-2)
etc/maas/pserv.yaml (+0/-28)
etc/maas/templates/pxe/config.install.armhf.template (+0/-5)
scripts/maas-import-pxe-files (+39/-446)
setup.py (+1/-0)
src/maasserver/models/bootimage.py (+1/-1)
src/maasserver/preseed.py (+24/-3)
src/maasserver/tests/test_preseed.py (+42/-5)
src/metadataserver/tests/test_api.py (+6/-1)
src/provisioningserver/boot_images.py (+3/-7)
src/provisioningserver/config.py (+10/-8)
src/provisioningserver/driver/__init__.py (+2/-2)
src/provisioningserver/import_images/boot_resources.py (+341/-86)
src/provisioningserver/import_images/tests/test_boot_resources.py (+54/-0)
src/provisioningserver/import_images/tests/test_ephemerals_script.py (+0/-117)
src/provisioningserver/kernel_opts.py (+5/-23)
src/provisioningserver/pxe/config.py (+9/-6)
src/provisioningserver/pxe/tests/test_config.py (+4/-43)
src/provisioningserver/pxe/tests/test_tftppath.py (+32/-12)
src/provisioningserver/pxe/tftppath.py (+34/-17)
src/provisioningserver/rpc/tests/test_clusterservice.py (+2/-2)
src/provisioningserver/testing/boot_images.py (+16/-3)
src/provisioningserver/tests/test_config.py (+9/-8)
src/provisioningserver/tests/test_kernel_opts.py (+5/-42)
src/provisioningserver/tests/test_maas_import_pxe_files.py (+6/-0)
src/provisioningserver/tests/test_upgrade_cluster.py (+56/-2)
src/provisioningserver/tftp.py (+2/-0)
src/provisioningserver/upgrade_cluster.py (+24/-1)
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