← Back to branch summary

~justin-fathomdb/nova/bug744150

« back to all changes in this revision

Viewing changes to nova/volume/driver.py

  • Committer: Andy Smith
  • Date: 2011-01-18 23:51:13 UTC
  • mfrom: (579 nova)
  • mto: This revision was merged to the branch mainline in revision 581.
  • Revision ID: code@term.ie-20110118235113-ivu21efg3h9z6niq
merge from upstream and fix small issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/volume/driver.py
47
47
                    'Number of iscsi target ids per host')
48
48
flags.DEFINE_string('iscsi_target_prefix', 'iqn.2010-10.org.openstack:',
49
49
                    'prefix for iscsi volumes')
50
 
flags.DEFINE_string('iscsi_ip_prefix', '127.0',
 
50
flags.DEFINE_string('iscsi_ip_prefix', '$my_ip',
51
51
                    'discover volumes on the ip that starts with this prefix')
52
52
flags.DEFINE_string('rbd_pool', 'rbd',
53
53
                    'the rbd pool in which volumes are stored')
285
285
        self._execute("sudo iscsiadm -m node -T %s -p %s --op update "
286
286
                      "-n node.startup -v automatic" %
287
287
                      (iscsi_name, iscsi_portal))
288
 
        return "/dev/iscsi/%s" % volume['name']
 
288
        return "/dev/disk/by-path/ip-%s-iscsi-%s-lun-0" % (iscsi_portal,
 
289
                                                           iscsi_name)
289
290
 
290
291
    def undiscover_volume(self, volume):
291
292
        """Undiscover volume on a remote host."""