From: Derek Higgins Date: Tue, 28 May 2013 09:47:43 +0000 (+0100) Subject: Use heat-engine.conf for heat-manage config X-Git-Tag: 2014.1~545 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=3f72ad87f48fe19c7903ef9f685d2000171abd9d;p=openstack-build%2Fheat-build.git Use heat-engine.conf for heat-manage config Fixes bug 1184923 because prog was missing the CONF object was looking for the config file in /etc/heat/heat.conf this should have been /etc/heat/heat-engine.conf Change-Id: Ie23b9998df368274d69180e0d619b042dd9dc053 --- diff --git a/heat/cmd/manage.py b/heat/cmd/manage.py index 2e0a48d0..97262d81 100644 --- a/heat/cmd/manage.py +++ b/heat/cmd/manage.py @@ -63,7 +63,7 @@ command_opt = cfg.SubCommandOpt('command', def main(): CONF.register_cli_opt(command_opt) try: - CONF(sys.argv[1:], project='heat', + CONF(sys.argv[1:], project='heat', prog='heat-engine', version=version.version_info.version_string()) log.setup("heat") db_api.configure()