From 063bfde3714aa67690602f123089f23c5b899c55 Mon Sep 17 00:00:00 2001 From: Ben Swartzlander Date: Tue, 24 Feb 2015 13:49:36 -0500 Subject: [PATCH] Remove obsolete option: enabled_backends The correct option name is enabled_share_backends. This change removes the obsolete option and corrects the documentation to reference the correct name. Change-Id: I616f6006966f33b261e8ead43bd7757c03797bef Closes-Bug: #1425237 --- doc/source/adminref/multi_backends.rst | 8 ++++---- manila/common/config.py | 5 ----- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/doc/source/adminref/multi_backends.rst b/doc/source/adminref/multi_backends.rst index b06acd6134..95c429b41a 100644 --- a/doc/source/adminref/multi_backends.rst +++ b/doc/source/adminref/multi_backends.rst @@ -31,16 +31,16 @@ available capacity are met). Enable multiple back ends ========================= -To enable multiple share back ends, you must set the enabled_backends flag -in the manila.conf file. This flag defines the names (separated by a comma) -of the configuration stanzas for the different back ends: one name is +To enable multiple share back ends, you must set the enabled_share_backends +flag in the manila.conf file. This flag defines the names (separated by a +comma) of the configuration stanzas for the different back ends: one name is associated to one configuration group for a back end. The following example shows five configured back ends: [DEFAULT] - enabled_backends=backendEMC1,backendEMC2,backendGeneric1,backendGeneric2,backendNetApp + enabled_share_backends=backendEMC1,backendEMC2,backendGeneric1,backendGeneric2,backendNetApp [backendEMC1] share_driver=manila.share.drivers.emc.driver.EMCShareDriver diff --git a/manila/common/config.py b/manila/common/config.py index 209bf7577a..e64e3ef1ca 100644 --- a/manila/common/config.py +++ b/manila/common/config.py @@ -159,11 +159,6 @@ global_opts = [ default='keystone', help='The strategy to use for auth. Supports noauth, keystone, ' 'and deprecated.'), - cfg.ListOpt('enabled_backends', - default=None, - help='A list of backend names to use. These backend names ' - 'should be backed by a unique [CONFIG] group ' - 'with its options.'), cfg.ListOpt('enabled_share_backends', default=None, help='A list of share backend names to use. These backend '