diff options
| author | Chuck Short <chuck.short@canonical.com> | 2012-06-21 13:50:22 -0400 |
|---|---|---|
| committer | Chuck Short <chuck.short@canonical.com> | 2012-06-22 15:09:35 -0400 |
| commit | 01c654e2ef6db17e677d5e9a0d8e781d374bdbbe (patch) | |
| tree | f781ea6a91c04e638da008063dfb7b0e1fa54801 /nova | |
| parent | 3252371afca71f57c171569676d5de70439d5384 (diff) | |
| download | nova-01c654e2ef6db17e677d5e9a0d8e781d374bdbbe.tar.gz nova-01c654e2ef6db17e677d5e9a0d8e781d374bdbbe.tar.xz nova-01c654e2ef6db17e677d5e9a0d8e781d374bdbbe.zip | |
Make tgtadm the default iscsi user-land helper.
Most modern Linux distrobutions have tgtadm as their
default iscsi user-land helper. This includes Ubuntu,
Fedora, RHEL, SuSe, and others.
Make it default for nova as well. No change is
required for devstack since its the default as well.
Change-Id: I3f5204f08bfd9ef41eda2df7aa6bb35559516213
Signed-off-by: Chuck Short <chuck.short@canonical.com>
Diffstat (limited to 'nova')
| -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 ccf271bed..43f424a05 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 |