From 5ada5bf7f21051932bcc408293ce5935fc9659ef Mon Sep 17 00:00:00 2001 From: Tom Barron Date: Mon, 30 Oct 2017 13:45:26 -0400 Subject: [PATCH] Remove deprecated ganesha_nfs_export_options They were deprecated in pike [1]. Remove them in Queens. TrivialFix [1] If39f1622583dd797152de0c93ba68ab0b28cb632 Change-Id: Icd89f1d3bddbecc48d4af0f2e9ead9f61cc6f6fe --- doc/source/configuration/tables/manila-ganesha.inc | 2 -- manila/share/driver.py | 10 ---------- 2 files changed, 12 deletions(-) diff --git a/doc/source/configuration/tables/manila-ganesha.inc b/doc/source/configuration/tables/manila-ganesha.inc index ee74537421..e62c63635a 100644 --- a/doc/source/configuration/tables/manila-ganesha.inc +++ b/doc/source/configuration/tables/manila-ganesha.inc @@ -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. diff --git a/manila/share/driver.py b/manila/share/driver.py index c8776c6df1..0ba3850016 100644 --- a/manila/share/driver.py +++ b/manila/share/driver.py @@ -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.'),