openstack
/
manila
Code Issues Proposed changes

Merge "Remove obsolete option: enabled_backends"

This commit is contained in:
Jenkins 2015-03-01 21:32:45 +00:00 committed by Gerrit Code Review
parent bcbab9ce11 063bfde371
commit b76becd303
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/source/adminref/multi_backends.rst
View File

@ -31,16 +31,16 @@ available capacity are met).
Enable multiple back ends Enable multiple back ends
========================= =========================
To enable multiple share back ends, you must set the enabled_backends flag To enable multiple share back ends, you must set the enabled_share_backends
in the manila.conf file. This flag defines the names (separated by a comma) flag in the manila.conf file. This flag defines the names (separated by a
of the configuration stanzas for the different back ends: one name is comma) of the configuration stanzas for the different back ends: one name is
associated to one configuration group for a back end. associated to one configuration group for a back end.
The following example shows five configured back ends: The following example shows five configured back ends:
[DEFAULT] [DEFAULT]
enabled_backends=backendEMC1,backendEMC2,backendGeneric1,backendGeneric2,backendNetApp enabled_share_backends=backendEMC1,backendEMC2,backendGeneric1,backendGeneric2,backendNetApp
[backendEMC1] [backendEMC1]
share_driver=manila.share.drivers.emc.driver.EMCShareDriver share_driver=manila.share.drivers.emc.driver.EMCShareDriver

5
manila/common/config.py
View File

@ -159,11 +159,6 @@ global_opts = [
default='keystone', default='keystone',
help='The strategy to use for auth. Supports noauth, keystone, ' help='The strategy to use for auth. Supports noauth, keystone, '
'and deprecated.'), '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', cfg.ListOpt('enabled_share_backends',
default=None, default=None,
help='A list of share backend names to use. These backend ' help='A list of share backend names to use. These backend '