Merge lp:~newell-jensen/maas/fix-1685835 into lp:~maas-committers/maas/trunk
Proposed by
Newell Jensen
Status: | Merged |
---|---|
Approved by: | Blake Rouse |
Approved revision: | no longer in the source branch. |
Merged at revision: | 6018 |
Proposed branch: | lp:~newell-jensen/maas/fix-1685835 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
306 lines (+104/-33) 2 files modified
src/provisioningserver/drivers/pod/rsd.py (+55/-18) src/provisioningserver/drivers/pod/tests/test_rsd.py (+49/-15) |
To merge this branch: | bzr merge lp:~newell-jensen/maas/fix-1685835 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email: mp+323188@code.launchpad.net |
Commit message
Ignore remote storage if the InitiatorIQN is non-empty in pre-composed nodes. This information is taken into account for calculating the total, available, and used iscsi storage on the RSD pod.
To post a comment you must log in.
Looks good.