openstack/senlin
Code Issues Proposed changes

Delete some useless options in config

Browse Source 
Some configuration options are never used in Senlin. Delete them from
the config module and the sample config file.

Change-Id: I0ef4f63d4c77397bf2a346c1f13547dfa45d44fc
This commit is contained in:
tengqm 2015-04-25 23:47:27 -04:00
parent b847cc5b6e
commit bda59efe5b
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etc/senlin/senlin.conf.sample
View File

@ -145,19 +145,11 @@
# From senlin.common.config
#
# Select deferred auth method, stored password or trusts. (string value)
# Allowed values: password, trusts
#deferred_auth_method = password
# Subset of trustor roles to be delegated to senlin. If left unset, all roles of a user will be delegated to senlin
# when creating a cluster. (list value)
#trusts_delegated_roles =
# The directory to search for environment files. (string value)
#environment_dir = /etc/senlin/environments
# Maximum members allowed per top-level cluster. (integer value)
#max_members_per_cluster = 1000
# Maximum nodes allowed per top-level cluster. (integer value)
#max_nodes_per_cluster = 1000
# Maximum number of clusters any one project may have active at one time. (integer value)
#max_clusters_per_project = 100

14
senlin/common/config.py
View File

@ -49,22 +49,12 @@ service_opts = [
help=_('Number of senlin-engine processes to fork and run.'))]
engine_opts = [
cfg.StrOpt('deferred_auth_method',
choices=['password', 'trusts'],
default='password',
help=_('Select deferred auth method, '
'stored password or trusts.')),
cfg.ListOpt('trusts_delegated_roles',
default=[],
help=_('Subset of trustor roles to be delegated to senlin.'
' If left unset, all roles of a user will be'
' delegated to senlin when creating a cluster.')),
cfg.StrOpt('environment_dir',
default='/etc/senlin/environments',
help=_('The directory to search for environment files.')),
cfg.IntOpt('max_members_per_cluster',
cfg.IntOpt('max_nodes_per_cluster',
default=1000,
help=_('Maximum members allowed per top-level cluster.')),
help=_('Maximum nodes allowed per top-level cluster.')),
cfg.IntOpt('max_clusters_per_project',
default=100,
help=_('Maximum number of clusters any one project may have'