diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-25 22:01:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-25 22:01:05 +0000 |
| commit | aaadd381bbee3ec61f7f64ae5de3e635f0afe627 (patch) | |
| tree | f90c21344d3bef3ccb9eed373d260c6b83bba75f | |
| parent | 169d0ca4df833766c878ef3ca62868ce38610db1 (diff) | |
| parent | 01c654e2ef6db17e677d5e9a0d8e781d374bdbbe (diff) | |
Merge "Make tgtadm the default iscsi user-land helper."
| -rw-r--r-- | nova/tests/test_libvirt.py | 6 | ||||
| -rw-r--r-- | nova/volume/iscsi.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py index bf46234c8..ada8c0021 100644 --- a/nova/tests/test_libvirt.py +++ b/nova/tests/test_libvirt.py @@ -165,7 +165,7 @@ class LibvirtVolumeTestCase(test.TestCase): mount_device = "vde" conf = libvirt_driver.connect_volume(connection_info, mount_device) tree = conf.format_dom() - dev_str = '/dev/disk/by-path/ip-%s-iscsi-%s-lun-0' % (location, iqn) + dev_str = '/dev/disk/by-path/ip-%s-iscsi-%s-lun-1' % (location, iqn) self.assertEqual(tree.get('type'), 'block') self.assertEqual(tree.find('./source').get('dev'), dev_str) libvirt_driver.disconnect_volume(connection_info, mount_device) @@ -204,7 +204,7 @@ class LibvirtVolumeTestCase(test.TestCase): mount_device = "vde" conf = libvirt_driver.connect_volume(connection_info, mount_device) tree = conf.format_dom() - dev_str = '/dev/disk/by-path/ip-%s-iscsi-%s-lun-0' % (location, iqn) + dev_str = '/dev/disk/by-path/ip-%s-iscsi-%s-lun-1' % (location, iqn) self.assertEqual(tree.get('type'), 'block') self.assertEqual(tree.find('./source').get('dev'), dev_str) libvirt_driver.disconnect_volume(connection_info, mount_device) @@ -317,7 +317,7 @@ class LibvirtVolumeTestCase(test.TestCase): mount_device = "vde" conf = libvirt_driver.connect_volume(connection_info, mount_device) tree = conf.format_dom() - dev_str = '/dev/disk/by-path/ip-%s-iscsi-%s-lun-0' % (location, iqn) + dev_str = '/dev/disk/by-path/ip-%s-iscsi-%s-lun-1' % (location, iqn) self.assertEqual(tree.get('type'), 'block') self.assertEqual(tree.find('./source').get('dev'), dev_str) libvirt_driver.disconnect_volume(connection_info, mount_device) diff --git a/nova/volume/iscsi.py b/nova/volume/iscsi.py index 115d51c80..33ee7dabc 100644 --- a/nova/volume/iscsi.py +++ b/nova/volume/iscsi.py @@ -26,7 +26,7 @@ from nova import utils iscsi_helper_opt = cfg.StrOpt('iscsi_helper', - default='ietadm', + default='tgtadm', help='iscsi target user-land tool to use') FLAGS = flags.FLAGS |