Fix FLAGS.volumes_dir help message

And other nova/volume/iscsi.py typos

Change-Id: I08e7d4379f6a455273df999b621f8a89e73e0aef
This commit is contained in:
Joe Gordon
2012-09-12 16:30:25 -07:00
parent b961bd4c29
commit a7cfd754d1
2 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -1791,7 +1791,7 @@
#### (StrOpt) iscsi target user-land tool to use
# volumes_dir=$state_path/volumes
#### (StrOpt) Volume configfuration file storage directory
#### (StrOpt) Volume configuration file storage directory
######## defined in nova.volume.manager ########
+3 -3
View File
@@ -35,7 +35,7 @@ iscsi_helper_opt = [
help='iscsi target user-land tool to use'),
cfg.StrOpt('volumes_dir',
default='$state_path/volumes',
help='Volume configfuration file storage directory'),
help='Volume configuration file storage directory'),
]
FLAGS = flags.FLAGS
@@ -107,7 +107,7 @@ class TgtAdm(TargetAdmin):
def create_iscsi_target(self, name, tid, lun, path, **kwargs):
# Note(jdg) tid and lun aren't used by TgtAdm but remain for
# compatability
# compatibility
utils.ensure_tree(FLAGS.volumes_dir)
@@ -136,7 +136,7 @@ class TgtAdm(TargetAdmin):
LOG.error(_("Failed to create iscsi target for volume "
"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)
raise exception.ISCSITargetCreateFailed(volume_id=vol_id)