summaryrefslogtreecommitdiffstats
path: root/keystone/config.py
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-11-26 16:16:54 +0000
committerMark McLoughlin <markmc@redhat.com>2012-11-26 16:19:36 +0000
commit904af119d2b84a93e416b7b297eda3b321840669 (patch)
tree948afdfaba031264c4ac8ead4ccc64ccb239d0db /keystone/config.py
parent07c1aafdf20db6d6d7c0d3e15074bc02e2f1d2aa (diff)
downloadkeystone-904af119d2b84a93e416b7b297eda3b321840669.tar.gz
keystone-904af119d2b84a93e416b7b297eda3b321840669.tar.xz
keystone-904af119d2b84a93e416b7b297eda3b321840669.zip
Stop using cfg's internal implementation details
The fact that a cfg opt register using register_opt() is available via the command line is actually a bug (see bug #1082279). Also, using the _cli_values attribute is clearly poking into private implementation details. Fix both issues by registering the opt using register_cli_opt() and accessing its value the normal way. Change-Id: If170dcd96daae5b4c3d7cdebed914df417c2209b
Diffstat (limited to 'keystone/config.py')
-rw-r--r--keystone/config.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/keystone/config.py b/keystone/config.py
index 9c4805b9..71675748 100644
--- a/keystone/config.py
+++ b/keystone/config.py
@@ -122,6 +122,9 @@ def register_cli_int(*args, **kw):
group = kw.pop('group', None)
return conf.register_cli_opt(cfg.IntOpt(*args, **kw), group=group)
+
+register_cli_bool('standard-threads', default=False)
+
register_str('admin_token', default='ADMIN')
register_str('bind_host', default='0.0.0.0')
register_str('compute_port', default=8774)
@@ -129,7 +132,6 @@ register_str('admin_port', default=35357)
register_str('public_port', default=5000)
register_str('onready')
register_str('auth_admin_prefix', default='')
-register_bool('standard-threads', default=False)
register_str('policy_file', default='policy.json')
register_str('policy_default_rule', default=None)