Merge lp://qastaging/~zulcss/nova/nova-iscsitarget-removal into lp://qastaging/~hudson-openstack/nova/trunk
Proposed by
Chuck Short
Status: | Work in progress | ||||
---|---|---|---|---|---|
Proposed branch: | lp://qastaging/~zulcss/nova/nova-iscsitarget-removal | ||||
Merge into: | lp://qastaging/~hudson-openstack/nova/trunk | ||||
Diff against target: |
95 lines (+12/-12) 2 files modified
nova/tests/test_volume.py (+2/-2) nova/volume/driver.py (+10/-10) |
||||
To merge this branch: | bzr merge lp://qastaging/~zulcss/nova/nova-iscsitarget-removal | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Soren Hansen (community) | Needs Fixing | ||
Jason Kölker (community) | Abstain | ||
Review via email:
|
Description of the change
Uses tgt instead of iscsitarget.
To post a comment you must log in.
Unmerged revisions
- 1356. By Chuck Short
-
Use tgtadm rather than ietadm
I would rather this split out into the driver/implementer pattern rather than a straight up flip, but I'll let those who use this stuff make the call.
Something is up the the lp diff system so its not showing up. Here is is for future reviewers:
=== modified file 'nova/tests/ test_volume. py' test_volume. py 2011-07-08 03:07:58 +0000 test_volume. py 2011-08-03 14:10:33 +0000
self. mox.StubOutWith Mock(self. volume. driver, '_execute') get_iscsi_ target_ num(self. context, i) driver. _execute( "sudo", "ietadm", "--op", "show", driver. _execute( "sudo", "tgtadm", "--op", "show",
" --tid=% (tid)d" % locals())
--- nova/tests/
+++ nova/tests/
@@ -414,7 +414,7 @@
for i in volume_id_list:
tid = db.volume_
- self.volume.
+ self.volume.
@@ -433,7 +433,7 @@
# the first vblade process isn't running
tid = db.volume_
- self.volume.
+ self.volume.
=== modified file 'nova/volume/ driver. py' driver. py 2011-06-24 12:01:51 +0000 driver. py 2011-08-03 14:10:33 +0000
--- nova/volume/
+++ nova/volume/
@@ -328,7 +328,7 @@
We make use of model provider properties as follows:
:provider_ location: if present, contains the iSCSI target information
i.e. '<ip>:< port>,< portal> <target IQN>'
- in the same format as an ietadm discovery
+ in the same format as an tgtadm discovery
:provider_ auth: if present, contains a space-separated triple:
@@ -348,12 +348,12 @@
iscsi_name = "%s%s" % (FLAGS. iscsi_target_ prefix, volume['name'])
volume_ path = "/dev/%s/%s" % (FLAGS. volume_ group, volume['name']) exec('sudo' , 'ietadm', '--op', 'new', exec('sudo' , 'tgtadm', '--op', 'new',
"-- tid=%s" % iscsi_target,
'-- params' ,
"Name= %s" % iscsi_name,
check_ exit_code= False) exec('sudo' , 'ietadm', '--op', 'new', exec('sudo' , 'tgtadm', '--op', 'new',
"-- tid=%s" % iscsi_target,
'-- lun=0',
'-- params' ,
volume[ 'host'] ) iscsi_target_ prefix, volume['name'])
volume_ path = "/dev/%s/%s" % (FLAGS. volume_ group, volume['name']) 'sudo', 'ietadm', '--op', 'new', 'sudo', 'tgtadm', '--op', 'new',
'--tid= %s' % iscsi_target,
'--params' , 'Name=%s' % iscsi_name) 'sudo', 'ietad...
- self._sync_
+ self._sync_
- self._sync_
+ self._sync_
@@ -378,10 +378,10 @@
iscsi_name = "%s%s" % (FLAGS.
- self._execute(
+ self._execute(
- self._execute(