diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-14 08:42:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-14 08:42:22 +0000 |
| commit | 4419badf187acfc100dff1ba05bb1543eab60ba7 (patch) | |
| tree | 1ebda495babf41809044e94d1e585ddd881a5a94 | |
| parent | 5e6ae0822097f379ee2ee623c4e6213f1d930bf8 (diff) | |
| parent | 15cc877cc2af71135b896974f17cb4a63291a08c (diff) | |
Merge "Fix tgtadm off by one error. Fixes bug #871278"
| -rw-r--r-- | nova/virt/libvirt/volume.py | 11 | ||||
| -rw-r--r-- | nova/volume/driver.py | 11 |
2 files changed, 16 insertions, 6 deletions
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? |