Merge lp://qastaging/~markmc/nova/iscsi-tgtadm-choice into lp://qastaging/~hudson-openstack/nova/trunk
| Status: | Work in progress | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~markmc/nova/iscsi-tgtadm-choice | ||||
| Merge into: | lp://qastaging/~hudson-openstack/nova/trunk | ||||
| Diff against target: |
553 lines (+331/-76) 4 files modified
nova/tests/test_iscsi.py (+116/-0) nova/tests/test_volume.py (+6/-11) nova/volume/driver.py (+53/-65) nova/volume/iscsi.py (+156/-0) |
||||
| To merge this branch: | bzr merge lp://qastaging/~markmc/nova/iscsi-tgtadm-choice | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Christopher MacGown (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add --iscsi_helper flag and support tgtadm (lp:819997)
The iSCSI enterprise target project (aka iet) never went into the upstream kernel and never got into Fedora.
On the other hand, the tgt project did get its kernel module upstream and its userland packaged in Fedora as scsi-target-utils. It seems that tgt is the preferred option for Ubuntu too.
Nova upstream uses ietadm from the former, but since this isn't available in Fedora we need the option of using tgtadm instead.
This merge adds an --iscsi_helper flag which can be set to ietadm or tgtadm. The former is used by default to preserve the current behaviour.
| Chuck Short (zulcss) wrote | # |
| Mark McLoughlin (markmc) wrote | # |
Unmerged revisions
- 1422. By Mark McLoughlin
-
Refactor ietadm/tgtadm calls out into helper classes
Add a new TargetAdmin abstract base class and implement it using ietadm
and tgtadm. This cleans up the code greatly and gets us some code reuse. - 1421. By Mark McLoughlin
-
Remove VolumeDriver.
sync_exec method We always use the same functions for sync_exec and execute.
The execute method is always synchronous, so the distinction doesn't
appear to make sense.Finally, it looks like it would make sense for execute to ever be
async, so the distinction isn't even serving a useful documentation
purpose. - 1420. By Mark McLoughlin
-
Fix pep8 issues
- 1419. By Mark McLoughlin
-
Merge trunk
- 1418. By Chuck Short
-
Fix pep8 errors
- 1417. By Chuck Short
-
Fixup thinkos
- 1416. By Chuck Short
-
Allow the user to choose either ietadm or tgtadm
lgtm