From 2db9b282a00546c57b85c47ca5bcbee39f5c7924 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Mon, 29 Apr 2013 13:46:57 +0100 Subject: [PATCH] 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 --- bin/heat-engine | 1 + heat/engine/service.py | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/heat-engine b/bin/heat-engine index 08493880..ef885b1d 100755 --- 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 df34da61..efd962c1 100644 --- 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: -- 2.45.2