openstack/cinder
Code Issues Proposed changes

Fix FLAGS.volumes_dir help message

Browse Source 
And other nova/volume/iscsi.py typos

Change-Id: I781a07b4f11b6cf336c278a6994bd5575ae1a70a
This commit is contained in:
Joe Gordon
2012-09-12 18:06:34 -07:00
parent fde1827200
commit a3e7da8c51
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/volume/iscsi.py
View File

@@ -35,7 +35,7 @@ iscsi_helper_opt = [
help='iscsi target user-land tool to use'), help='iscsi target user-land tool to use'),
cfg.StrOpt('volumes_dir', cfg.StrOpt('volumes_dir',
default='$state_path/volumes', default='$state_path/volumes',
help='Volume configfuration file storage directory'), help='Volume configuration file storage directory'),
] ]
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
@@ -107,7 +107,7 @@ class TgtAdm(TargetAdmin):
def create_iscsi_target(self, name, tid, lun, path, **kwargs): def create_iscsi_target(self, name, tid, lun, path, **kwargs):
# Note(jdg) tid and lun aren't used by TgtAdm but remain for # Note(jdg) tid and lun aren't used by TgtAdm but remain for
# compatability # compatibility
if not os.path.exists(FLAGS.volumes_dir): if not os.path.exists(FLAGS.volumes_dir):
os.makedirs(FLAGS.volumes_dir) os.makedirs(FLAGS.volumes_dir)
@@ -137,7 +137,7 @@ class TgtAdm(TargetAdmin):
LOG.error(_("Failed to create iscsi target for volume " LOG.error(_("Failed to create iscsi target for volume "
"id:%(vol_id)s.") % locals()) "id:%(vol_id)s.") % locals())
#Dont forget to remove the persistent file we created #Don't forget to remove the persistent file we created
os.unlink(volume_path) os.unlink(volume_path)
raise exception.ISCSITargetCreateFailed(volume_id=vol_id) raise exception.ISCSITargetCreateFailed(volume_id=vol_id)