heat engine : register options before using them

Fix regression caused by the __init__.py refactoring, which means
we try to use cfg.CONF.host before registering it.

fixes bug #1174302

Change-Id: Iff4d75f53e242d7df8c7071cbeeead034a7ad9b0

diff --git a/bin/heat-engine b/bin/heat-engine
index 084938805f1fd45ff811ec5d443759c5ed69fa66..ef885b1dfceba4483209957c408971dbfacdaeef 100755 (executable)
--- a/bin/heat-engine
+++ b/bin/heat-engine
@@ -63,6 +63,7 @@ if __name__ == '__main__':
     from heat.engine import service as engine
 
     db_api.configure()
+    config.register_engine_opts()
     srv = engine.EngineService(cfg.CONF.host, rpc_api.ENGINE_TOPIC)
     launcher = service.launch(srv)
     launcher.wait()

diff --git a/heat/engine/service.py b/heat/engine/service.py
index df34da6160823189360cb89523dac56da3b1ad5d..efd962c1ac115c51a58d160e50c5d618fe8a5414 100644 (file)
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@@ -19,7 +19,6 @@ import json
 from oslo.config import cfg
 import webob
 
-from heat.common import config
 from heat.common import context
 from heat.db import api as db_api
 from heat.engine import api
@@ -66,7 +65,6 @@ class EngineService(service.Service):
         super(EngineService, self).__init__(host, topic)
         # stg == "Stack Thread Groups"
         self.stg = {}
-        config.register_engine_opts()
 
     def _start_in_thread(self, stack_id, func, *args, **kwargs):
         if stack_id not in self.stg: