Merge lp://qastaging/~raharper/curtin/trunk.zfs-root into lp://qastaging/~curtin-dev/curtin/trunk
| Status: | Rejected |
|---|---|
| Rejected by: | Scott Moser |
| Proposed branch: | lp://qastaging/~raharper/curtin/trunk.zfs-root |
| Merge into: | lp://qastaging/~curtin-dev/curtin/trunk |
| Diff against target: |
1629 lines (+1327/-14) 17 files modified
curtin/block/__init__.py (+45/-1) curtin/block/clear_holders.py (+9/-1) curtin/block/zfs.py (+302/-0) curtin/commands/block_meta.py (+75/-2) curtin/commands/curthooks.py (+16/-3) curtin/commands/install.py (+4/-0) curtin/deps/__init__.py (+27/-1) curtin/util.py (+29/-0) doc/topics/storage.rst (+138/-0) examples/tests/zfsroot.yaml (+101/-0) helpers/common (+7/-1) tests/unittests/test_block.py (+22/-0) tests/unittests/test_block_zfs.py (+386/-0) tests/unittests/test_clear_holders.py (+25/-3) tests/unittests/test_curthooks.py (+2/-2) tests/unittests/test_util.py (+74/-0) tests/vmtests/test_zfsroot.py (+65/-0) |
| To merge this branch: | bzr merge lp://qastaging/~raharper/curtin/trunk.zfs-root |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Server Team CI bot | continuous-integration | Approve | |
| curtin developers | Pending | ||
|
Review via email:
|
|||
Description of the change
Add zpool, zfs storage command support for ZFS on Root
curtin/block
- Add get_dev_disk_byid() to return a mapping of devname to disk/by-id paths
- Add zfs and zpool to install deps dictionary
curtin/
- Add modprobe zfs
curtin/block/zfs
- implement zpool_create, zfs_create, zfs_set, and zfs_mount commands
curtin/
- implement handlers for type: zpool and zfs
- add get_poolname resolver
- add zfsroot sgdisk partition flag
curtin/
- update util.install_
in all locations except install_kernel(); this prevents zfsutils-linux
from pulling zfs-dkms which is not needed but recommended in the package
- Add an injection of a zfs environment variable required for ZFS on rootfs
to work with grub; allows grub to extract the path to the zfs vdevs full
path rather than just the devname (/dev/disk/
curtin/
- Export ZPOOL_VDEV_
zfs on root
doc/topics/
- Add documentation for zpool, zfs configuration
helpers/common
- Update install_grub to skip block-device check if target mountpoint is zfs.
tests/unittests
- Add test for disk_byid methods
tests/unittests
- Add coverage for block.zfs
tests/unittests
- Update test to account for modprobe zfs
tests/unittests
- Update test to account for install_packages passing --no-install-
tests/vmtests/
- Add initial zfsroot install and test
| Server Team CI bot (server-team-bot) wrote | # |
| Server Team CI bot (server-team-bot) wrote | # |
| Server Team CI bot (server-team-bot) wrote | # |
| Server Team CI bot (server-team-bot) wrote | # |
| Scott Moser (smoser) wrote | # |
| Scott Moser (smoser) wrote | # |
Unmerged revisions
- 553. By Ryan Harper
-
vmtests: zfsroot enable dirty-disk mode to test clear-holders on zfs
- 552. By Ryan Harper
-
zfs: add zpool_list, zpool_export, device_to_poolname, clear-holders for zfs
- 551. By Ryan Harper
-
block: add devs list to blkid command, add is_zfs_member
- 550. By Ryan Harper
-
fix indentation for zfs fstab entries
- 549. By Ryan Harper
-
Switch clear_holders to use load_kernel_module
- 548. By Ryan Harper
-
util add kernel module loading helpers
- 547. By Ryan Harper
-
dependencies: add kernel module depedency checks
- 546. By Ryan Harper
-
zfsutils only on xenial and newer
- 545. By Ryan Harper
-
drop ramsize change, not needed
- 544. By Ryan Harper
-
Update storage doc with zpool, zfs commands and ZFS Root example
PASSED: Continuous integration, rev:545
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
Click here to trigger a rebuild:
https:/