summaryrefslogtreecommitdiff
path: root/bin/heat-engine
diff options
context:
space:
mode:
authorJulien Danjou <julien@danjou.info>2013-07-10 17:27:52 +0200
committerJulien Danjou <julien@danjou.info>2013-07-11 15:45:52 +0200
commitf2ef092d8ca73ee4cae8745f5985d5c0f108dac8 (patch)
treed932a83644f2b1c686b935084c1996d109b224dd /bin/heat-engine
parent535c44108ba78592982fd2dec3334a97fbf0da9b (diff)
downloadheat-f2ef092d8ca73ee4cae8745f5985d5c0f108dac8.tar.gz
Update oslo.notifier and always register options
This avoids registering multiple times the option if the registering functions are called multiple path by different code paths. It's necessary for the default configuration sample generator to have options only registered once. The update of oslo.notifier is needed to avoid it using the inexistant $host option. Change-Id: If31974d7ef7fdbf85a88e950ff06c60ccbd6c31d Signed-off-by: Julien Danjou <julien@danjou.info>
Diffstat (limited to 'bin/heat-engine')
-rwxr-xr-xbin/heat-engine2
1 files changed, 0 insertions, 2 deletions
diff --git a/bin/heat-engine b/bin/heat-engine
index 3e0167a44..14e6f1851 100755
--- a/bin/heat-engine
+++ b/bin/heat-engine
@@ -43,7 +43,6 @@ from oslo.config import cfg
from heat.openstack.common import log as logging
from heat.openstack.common import service
-from heat.common import config
from heat.db import api as db_api
from heat.rpc import api as rpc_api
@@ -64,7 +63,6 @@ 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()