From 15cc877cc2af71135b896974f17cb4a63291a08c Mon Sep 17 00:00:00 2001 From: Chuck Short Date: Tue, 13 Dec 2011 13:45:43 -0500 Subject: Fix tgtadm off by one error. Fixes bug #871278 Change-Id: Ia359045465ada9753b86d1a08cc947966b3ac899 Signed-off-by: Chuck Short --- nova/virt/libvirt/volume.py | 11 ++++++++--- nova/volume/driver.py | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) (limited to 'nova') diff --git a/nova/virt/libvirt/volume.py b/nova/virt/libvirt/volume.py index ff5bc1fe5..e5d73c08f 100644 --- a/nova/virt/libvirt/volume.py +++ b/nova/virt/libvirt/volume.py @@ -127,9 +127,14 @@ class LibvirtISCSIVolumeDriver(LibvirtVolumeDriver): self._iscsiadm_update(iscsi_properties, "node.startup", "automatic") - host_device = ("/dev/disk/by-path/ip-%s-iscsi-%s-lun-0" % - (iscsi_properties['target_portal'], - iscsi_properties['target_iqn'])) + if FLAGS.iscsi_helper == 'tgtadm': + host_device = ("/dev/disk/by-path/ip-%s-iscsi-%s-lun-1" % + (iscsi_properties['target_portal'], + iscsi_properties['target_iqn'])) + else: + host_device = ("/dev/disk/by-path/ip-%s-iscsi-%s-lun-0" % + (iscsi_properties['target_portal'], + iscsi_properties['target_iqn'])) # The /dev/disk/by-path/... node is not always present immediately # TODO(justinsb): This retry-with-delay is a pattern, move to utils? diff --git a/nova/volume/driver.py b/nova/volume/driver.py index 606b5b507..80761d604 100644 --- a/nova/volume/driver.py +++ b/nova/volume/driver.py @@ -781,9 +781,14 @@ class ZadaraBEDriver(ISCSIDriver): self._iscsiadm_update(iscsi_properties, "node.startup", "automatic") - mount_device = ("/dev/disk/by-path/ip-%s-iscsi-%s-lun-0" % - (iscsi_properties['target_portal'], - iscsi_properties['target_iqn'])) + if FLAGS.iscsi_helper == 'tgtadm': + mount_device = ("/dev/disk/by-path/ip-%s-iscsi-%s-lun-1" % + (iscsi_properties['target_portal'], + iscsi_properties['target_iqn'])) + else: + mount_device = ("/dev/disk/by-path/ip-%s-iscsi-%s-lun-0" % + (iscsi_properties['target_portal'], + iscsi_properties['target_iqn'])) # The /dev/disk/by-path/... node is not always present immediately # TODO(justinsb): This retry-with-delay is a pattern, move to utils? -- cgit