summaryrefslogtreecommitdiffstats
path: root/nova/volume
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-09-13 07:08:03 +0000
committerGerrit Code Review <review@openstack.org>2012-09-13 07:08:03 +0000
commit1827d6f3cd2c7efaf65c1efa873e2a9cbb50f382 (patch)
treef6003c21547d753100e68ccaa3b4fb3319bab257 /nova/volume
parentef8d6a57a166d20782d8ad284b2b72aa4ec48572 (diff)
parenta7cfd754d17840cbcd4d9cd10564ca30260e0dac (diff)
downloadnova-1827d6f3cd2c7efaf65c1efa873e2a9cbb50f382.tar.gz
nova-1827d6f3cd2c7efaf65c1efa873e2a9cbb50f382.tar.xz
nova-1827d6f3cd2c7efaf65c1efa873e2a9cbb50f382.zip
Merge "Fix FLAGS.volumes_dir help message"
Diffstat (limited to 'nova/volume')
-rw-r--r--nova/volume/iscsi.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/nova/volume/iscsi.py b/nova/volume/iscsi.py
index 4d18526de..48e088e05 100644
--- a/nova/volume/iscsi.py
+++ b/nova/volume/iscsi.py
@@ -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)