From: Zane Bitter <zbitter@redhat.com>
Date: Thu, 29 Nov 2012 19:51:01 +0000 (+0100)
Subject: Process engine config before initialisation
X-Git-Tag: 2014.1~1156
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=658a839665f78dd19804917774e3d175265628bd;p=openstack-build%2Fheat-build.git

Process engine config before initialisation

Don't import the heat-engine service module until the configuration options
have been initialised. This will allow us to read the configuration during
initialisation of the engine.

Change-Id: I2bc70d903434eac1fa248640018f038c5ef2bead
Signed-off-by: Zane Bitter <zbitter@redhat.com>
---

diff --git a/bin/heat-engine b/bin/heat-engine
index 9a4550c3..d0cf9561 100755
--- a/bin/heat-engine
+++ b/bin/heat-engine
@@ -44,7 +44,6 @@ from heat.openstack.common import service
 
 from heat.common import config
 from heat.db import api as db_api
-from heat.engine import service as engine
 
 
 logger = logging.getLogger('heat.engine')
@@ -57,6 +56,8 @@ if __name__ == '__main__':
     config.register_engine_opts()
     db_api.configure()
 
+    from heat.engine import service as engine
+
     srv = engine.EngineService(cfg.CONF.host,
                                 'engine')
     launcher = service.launch(srv)