Remove unused pecan configuration options
The pecan configuration options `static_root` and `template_path` in ceilometer/api/config.py has never take effect since the files which have specified don't exist. The two options actually is not required according to: http://pecan.readthedocs.org/en/latest/configuration.html#application-configuration This patch removes the two pecan configuration options. Change-Id: If7e7b264145544c1ff5359d108581320ee942b4d Closes-Bug: #1408858
This commit is contained in:
parent
a78961db68
commit
75b1c9a3ab
@ -81,8 +81,6 @@ def setup_app(pecan_config=None, extra_hooks=None):
|
|||||||
|
|
||||||
app = pecan.make_app(
|
app = pecan.make_app(
|
||||||
pecan_config.app.root,
|
pecan_config.app.root,
|
||||||
static_root=pecan_config.app.static_root,
|
|
||||||
template_path=pecan_config.app.template_path,
|
|
||||||
debug=CONF.api.pecan_debug,
|
debug=CONF.api.pecan_debug,
|
||||||
force_canonical=getattr(pecan_config.app, 'force_canonical', True),
|
force_canonical=getattr(pecan_config.app, 'force_canonical', True),
|
||||||
hooks=app_hooks,
|
hooks=app_hooks,
|
||||||
|
@ -20,8 +20,6 @@ server = {
|
|||||||
app = {
|
app = {
|
||||||
'root': 'ceilometer.api.controllers.root.RootController',
|
'root': 'ceilometer.api.controllers.root.RootController',
|
||||||
'modules': ['ceilometer.api'],
|
'modules': ['ceilometer.api'],
|
||||||
'static_root': '%(confdir)s/public',
|
|
||||||
'template_path': '%(confdir)s/ceilometer/api/templates',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Custom Configurations must be in Python dictionary format::
|
# Custom Configurations must be in Python dictionary format::
|
||||||
|
@ -50,15 +50,10 @@ class FunctionalTest(db_test_base.TestBase):
|
|||||||
self.app = self._make_app()
|
self.app = self._make_app()
|
||||||
|
|
||||||
def _make_app(self, enable_acl=False):
|
def _make_app(self, enable_acl=False):
|
||||||
# Determine where we are so we can set up paths in the config
|
|
||||||
root_dir = self.path_get()
|
|
||||||
|
|
||||||
self.config = {
|
self.config = {
|
||||||
'app': {
|
'app': {
|
||||||
'root': 'ceilometer.api.controllers.root.RootController',
|
'root': 'ceilometer.api.controllers.root.RootController',
|
||||||
'modules': ['ceilometer.api'],
|
'modules': ['ceilometer.api'],
|
||||||
'static_root': '%s/public' % root_dir,
|
|
||||||
'template_path': '%s/ceilometer/api/templates' % root_dir,
|
|
||||||
'enable_acl': enable_acl,
|
'enable_acl': enable_acl,
|
||||||
},
|
},
|
||||||
'wsme': {
|
'wsme': {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user