From bda59efe5b1a3f68dd9fdfd2ad30004e2ff9d0e8 Mon Sep 17 00:00:00 2001
From: tengqm <tengqim@cn.ibm.com>
Date: Sat, 25 Apr 2015 23:47:27 -0400
Subject: [PATCH] Delete some useless options in config

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

Change-Id: I0ef4f63d4c77397bf2a346c1f13547dfa45d44fc
---
 etc/senlin/senlin.conf.sample | 12 ++----------
 senlin/common/config.py       | 14 ++------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/etc/senlin/senlin.conf.sample b/etc/senlin/senlin.conf.sample
index 395afc6e9..c6d39d9e0 100644
--- a/etc/senlin/senlin.conf.sample
+++ b/etc/senlin/senlin.conf.sample
@@ -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
diff --git a/senlin/common/config.py b/senlin/common/config.py
index e10f9a145..d94c103ec 100644
--- a/senlin/common/config.py
+++ b/senlin/common/config.py
@@ -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'