openstack
/
manila
Code Issues Proposed changes

Remove deprecated ganesha_nfs_export_options 

They were deprecated in pike [1].

Remove them in Queens.

TrivialFix

[1] If39f1622583dd797152de0c93ba68ab0b28cb632

Change-Id: Icd89f1d3bddbecc48d4af0f2e9ead9f61cc6f6fe
This commit is contained in:
Tom Barron 2017-10-30 13:45:26 -04:00
parent ba907ca531
commit 5ada5bf7f2
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/configuration/tables/manila-ganesha.inc
View File

@ -28,7 +28,5 @@
- (String) Path to directory containing Ganesha export configuration. (Ganesha module only.)
* - ``ganesha_export_template_dir`` = ``/etc/manila/ganesha-export-templ.d``
- (String) Path to directory containing Ganesha export block templates. (Ganesha module only.)
* - ``ganesha_nfs_export_options`` = ``maxread = 65536, prefread = 65536``
- (String) Options to use when exporting a share using ganesha NFS server. Note that these defaults can be overridden when a share is created by passing metadata with key name export_options. Also note the complete set of default ganesha export options is specified in ganesha_utils. (GPFS only.)
* - ``ganesha_service_name`` = ``ganesha.nfsd``
- (String) Name of the ganesha nfs service.

10
manila/share/driver.py
View File

@ -156,16 +156,6 @@ ganesha_opts = [
cfg.StrOpt('ganesha_config_path',
default='$ganesha_config_dir/ganesha.conf',
help='Path to main Ganesha config file.'),
cfg.StrOpt('ganesha_nfs_export_options',
default='maxread = 65536, prefread = 65536',
deprecated_for_removal=True,
deprecated_reason="This option is no longer used.",
help='Options to use when exporting a share using ganesha '
'NFS server. Note that these defaults can be overridden '
'when a share is created by passing metadata with key '
'name export_options. Also note the complete set of '
'default ganesha export options is specified in '
'ganesha_utils. (GPFS only.)'),
cfg.StrOpt('ganesha_service_name',
default='ganesha.nfsd',
help='Name of the ganesha nfs service.'),