From 8caca03820898417f1f7333d6e4059de1383e3a1 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Wed, 21 Sep 2016 00:03:37 -0400 Subject: [PATCH] Fix problem when using wsgi script to start The calling of method prepare_service is missing when ceilometer- api started using wsgi script that pbr generated, this patch fixed this problem. Change-Id: I2210f408b0d3cc8378d62f62edce4edbe8102dad Closes-Bug: #1625918 --- ceilometer/api/app.py | 7 +++++++ setup.cfg | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ceilometer/api/app.py b/ceilometer/api/app.py index 21bb4218e9..e97754a078 100644 --- a/ceilometer/api/app.py +++ b/ceilometer/api/app.py @@ -24,6 +24,8 @@ import pecan from ceilometer.api import hooks from ceilometer.api import middleware +from ceilometer import service + LOG = log.getLogger(__name__) CONF = cfg.CONF @@ -94,3 +96,8 @@ def load_app(): def app_factory(global_config, **local_conf): return setup_app() + + +def build_wsgi_app(): + service.prepare_service() + return load_app() diff --git a/setup.cfg b/setup.cfg index 4e072c65f2..b3d08ec110 100644 --- a/setup.cfg +++ b/setup.cfg @@ -267,7 +267,7 @@ ceilometer.event.trait_plugin = timedelta = ceilometer.event.trait_plugins:TimedeltaPlugin wsgi_scripts = - ceilometer-api = ceilometer.api.app:load_app + ceilometer-api = ceilometer.api.app:build_wsgi_app console_scripts = ceilometer-polling = ceilometer.cmd.polling:main