Merge "Change nfs to NFS in the help strings of nfs.py"
This commit is contained in:
commit
31a9f73553
@ -42,7 +42,7 @@ NFS_OVERSUB_RATIO_DEFAULT = 1.0
|
||||
nfs_opts = [
|
||||
cfg.StrOpt('nfs_shares_config',
|
||||
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',
|
||||
default=True,
|
||||
help=('Create volumes as sparsed files which take no space.'
|
||||
@ -67,15 +67,15 @@ nfs_opts = [
|
||||
'in the Mitaka release.')),
|
||||
cfg.StrOpt('nfs_mount_point_base',
|
||||
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',
|
||||
help=('Mount options passed to the nfs client. See section '
|
||||
'of the nfs man page for details.')),
|
||||
help=('Mount options passed to the NFS client. See section '
|
||||
'of the NFS man page for details.')),
|
||||
cfg.IntOpt('nfs_mount_attempts',
|
||||
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 '
|
||||
'made to mount an nfs share, regardless of the '
|
||||
'made to mount an NFS share, regardless of the '
|
||||
'value specified.')),
|
||||
]
|
||||
|
||||
@ -217,7 +217,7 @@ class NfsDriver(driver.ExtendVD, remotefs.RemoteFSDriver):
|
||||
raise exception.NfsNoSuitableShareFound(
|
||||
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
|
||||
|
||||
@ -231,7 +231,7 @@ class NfsDriver(driver.ExtendVD, remotefs.RemoteFSDriver):
|
||||
space (total_available * nfs_oversub_ratio) to ensure enough space is
|
||||
available for the new volume.
|
||||
|
||||
:param nfs_share: nfs share
|
||||
:param nfs_share: NFS share
|
||||
:param volume_size_in_gib: int size in GB
|
||||
"""
|
||||
# Because the generic NFS driver aggregates over all shares
|
||||
|
Loading…
x
Reference in New Issue
Block a user