Merge lp://staging/~ltrager/maas-images/centos_storage_curthooks into lp://staging/maas-images
| Status: | Merged |
|---|---|
| Merged at revision: | 408 |
| Proposed branch: | lp://staging/~ltrager/maas-images/centos_storage_curthooks |
| Merge into: | lp://staging/maas-images |
| Diff against target: |
164 lines (+56/-40) 2 files modified
conf/centos.yaml (+10/-3) curtin/centos7/curtin-hooks.py (+46/-37) |
| To merge this branch: | bzr merge lp://staging/~ltrager/maas-images/centos_storage_curthooks |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andres Rodriguez (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Update CentOS 7 curthooks to use internal Curtin storage support.
Curtin now supports deploying custom storage on CentOS 7+. Hooks are no
longer required for CentOS but they are still included for backwards
compatibility. If CentOS is deployed with MAAS 2.5+ and a supported version of Curtin the hooks will simply call back into Curtin to configure storage.
If an older version of MAAS or Curtin is used the old hooks will still run.
Description of the change
Stream with updated CentOS 7 image: http://
Testing:
I tested in the CI and configured a BIOS and UEFI machine with 2 disk to have a btrfs filesystem for / on LVM on top of a RAID 1 over 2 disks
MAAS-2.4.1 + curtin-
MAAS-2.4.1 + curtin+
MAAS-master + curtin-
MAAS-master + curtin+
* curtin+
| Ryan Harper (raharper) | # |
| Lee Trager (ltrager) wrote | # |
| Lee Trager (ltrager) wrote | # |
| Lee Trager (ltrager) wrote | # |
Thanks for the review. I've updated to use the real package name as discussed on IRC. I was also able to confirm custom storage deployment works :)