openstack/cinder
Code Issues Proposed changes

Merge "Change nfs to NFS in the help strings of nfs.py"

Browse Source
This commit is contained in:
Jenkins 2015-11-09 20:39:11 +00:00 committed by Gerrit Code Review
commit 31a9f73553
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cinder/volume/drivers/nfs.py
View File

@ -42,7 +42,7 @@ NFS_OVERSUB_RATIO_DEFAULT = 1.0
nfs_opts = [ nfs_opts = [
cfg.StrOpt('nfs_shares_config', cfg.StrOpt('nfs_shares_config',
default='/etc/cinder/nfs_shares', default='/etc/cinder/nfs_shares',
help='File with the list of available nfs shares'), help='File with the list of available NFS shares'),
cfg.BoolOpt('nfs_sparsed_volumes', cfg.BoolOpt('nfs_sparsed_volumes',
default=True, default=True,
help=('Create volumes as sparsed files which take no space.' help=('Create volumes as sparsed files which take no space.'
@ -67,15 +67,15 @@ nfs_opts = [
'in the Mitaka release.')), 'in the Mitaka release.')),
cfg.StrOpt('nfs_mount_point_base', cfg.StrOpt('nfs_mount_point_base',
default='$state_path/mnt', default='$state_path/mnt',
help=('Base dir containing mount points for nfs shares.')), help=('Base dir containing mount points for NFS shares.')),
cfg.StrOpt('nfs_mount_options', cfg.StrOpt('nfs_mount_options',
help=('Mount options passed to the nfs client. See section ' help=('Mount options passed to the NFS client. See section '
'of the nfs man page for details.')), 'of the NFS man page for details.')),
cfg.IntOpt('nfs_mount_attempts', cfg.IntOpt('nfs_mount_attempts',
default=3, default=3,
help=('The number of attempts to mount nfs shares before ' help=('The number of attempts to mount NFS shares before '
'raising an error. At least one attempt will be ' 'raising an error. At least one attempt will be '
'made to mount an nfs share, regardless of the ' 'made to mount an NFS share, regardless of the '
'value specified.')), 'value specified.')),
] ]
@ -217,7 +217,7 @@ class NfsDriver(driver.ExtendVD, remotefs.RemoteFSDriver):
raise exception.NfsNoSuitableShareFound( raise exception.NfsNoSuitableShareFound(
volume_size=volume_size_in_gib) volume_size=volume_size_in_gib)
LOG.debug('Selected %s as target nfs share.', target_share) LOG.debug('Selected %s as target NFS share.', target_share)
return target_share return target_share
@ -231,7 +231,7 @@ class NfsDriver(driver.ExtendVD, remotefs.RemoteFSDriver):
space (total_available * nfs_oversub_ratio) to ensure enough space is space (total_available * nfs_oversub_ratio) to ensure enough space is
available for the new volume. available for the new volume.
:param nfs_share: nfs share :param nfs_share: NFS share
:param volume_size_in_gib: int size in GB :param volume_size_in_gib: int size in GB
""" """
# Because the generic NFS driver aggregates over all shares # Because the generic NFS driver aggregates over all shares