diff --git a/ceilometer/api/app.py b/ceilometer/api/app.py index cd03c8460..0f1f6c574 100644 --- a/ceilometer/api/app.py +++ b/ceilometer/api/app.py @@ -81,8 +81,6 @@ def setup_app(pecan_config=None, extra_hooks=None): app = pecan.make_app( pecan_config.app.root, - static_root=pecan_config.app.static_root, - template_path=pecan_config.app.template_path, debug=CONF.api.pecan_debug, force_canonical=getattr(pecan_config.app, 'force_canonical', True), hooks=app_hooks, diff --git a/ceilometer/api/config.py b/ceilometer/api/config.py index 083c4654a..ab7356391 100644 --- a/ceilometer/api/config.py +++ b/ceilometer/api/config.py @@ -20,8 +20,6 @@ server = { app = { 'root': 'ceilometer.api.controllers.root.RootController', 'modules': ['ceilometer.api'], - 'static_root': '%(confdir)s/public', - 'template_path': '%(confdir)s/ceilometer/api/templates', } # Custom Configurations must be in Python dictionary format:: diff --git a/ceilometer/tests/api/__init__.py b/ceilometer/tests/api/__init__.py index 7d1000cfc..9152f853e 100644 --- a/ceilometer/tests/api/__init__.py +++ b/ceilometer/tests/api/__init__.py @@ -50,15 +50,10 @@ class FunctionalTest(db_test_base.TestBase): self.app = self._make_app() 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 = { 'app': { 'root': 'ceilometer.api.controllers.root.RootController', 'modules': ['ceilometer.api'], - 'static_root': '%s/public' % root_dir, - 'template_path': '%s/ceilometer/api/templates' % root_dir, 'enable_acl': enable_acl, }, 'wsme': {