summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-09-25 04:02:36 +0000
committerGerrit Code Review <review@openstack.org>2014-09-25 04:02:36 +0000
commite39f3917e6e2c44ab1cda8c0ce2f3b4c884ee730 (patch)
tree51a94abf056375c0a1573b521fbcad96212165fe
parent4960fc2e9aaa3424140acefb4adb3bc05af9934d (diff)
parentf92ddd636d5d764949202d376597cb85c399d467 (diff)
downloadceilometer-e39f3917e6e2c44ab1cda8c0ce2f3b4c884ee730.tar.gz
Merge "Fix bug with wrong bool opt value interpolation"
-rw-r--r--ceilometer/api/app.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/ceilometer/api/app.py b/ceilometer/api/app.py
index 8e8b22ed..e72dd4ef 100644
--- a/ceilometer/api/app.py
+++ b/ceilometer/api/app.py
@@ -33,6 +33,9 @@ from ceilometer import storage
LOG = log.getLogger(__name__)
+CONF = cfg.CONF
+CONF.import_opt('debug', 'ceilometer.openstack.common.log')
+
auth_opts = [
cfg.StrOpt('api_paste_config',
default="api_paste.ini",
@@ -42,13 +45,12 @@ auth_opts = [
api_opts = [
cfg.BoolOpt('pecan_debug',
- default='$debug',
+ default=CONF.debug,
help='Toggle Pecan Debug Middleware. '
'Defaults to global debug value.'
),
]
-CONF = cfg.CONF
CONF.register_opts(auth_opts)
CONF.register_opts(api_opts, group='api')