openstack
/
heat
Code Issues Proposed changes

Merge "Adds version reporting for heat commands"

This commit is contained in:
Jenkins 2015-03-24 12:02:34 +00:00 committed by Gerrit Code Review
parent 882a839e5f cc95fcc5d8
commit 6c8f2dc31a
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/heat-api-cfn
View File

@ -43,6 +43,7 @@ from heat.common import messaging
from heat.common import profiler
from heat.common import wsgi
from heat.openstack.common import systemd
from heat import version
i18n.enable_lazy()
@ -51,7 +52,9 @@ LOG = logging.getLogger('heat.api.cfn')
if __name__ == '__main__':
try:
logging.register_options(cfg.CONF)
cfg.CONF(project='heat', prog='heat-api-cfn')
cfg.CONF(project='heat',
prog='heat-api-cfn',
version=version.version_info.version_string())
logging.setup(cfg.CONF, 'heat-api-cfn')
logging.set_defaults()
messaging.setup()

5
bin/heat-api-cloudwatch
View File

@ -43,6 +43,7 @@ from heat.common import messaging
from heat.common import profiler
from heat.common import wsgi
from heat.openstack.common import systemd
from heat import version
i18n.enable_lazy()
@ -51,7 +52,9 @@ LOG = logging.getLogger('heat.api.cloudwatch')
if __name__ == '__main__':
try:
logging.register_options(cfg.CONF)
cfg.CONF(project='heat', prog='heat-api-cloudwatch')
cfg.CONF(project='heat',
prog='heat-api-cloudwatch',
version=version.version_info.version_string())
logging.setup(cfg.CONF, 'heat-api-cloudwatch')
logging.set_defaults()
messaging.setup()

7
bin/heat-keystone-setup-domain
View File

@ -20,6 +20,8 @@ import keystoneclient.exceptions as kc_exception
from keystoneclient.v3 import client
from oslo_config import cfg
from heat import version
logger = logging.getLogger(__name__)
DEBUG = False
@ -53,7 +55,10 @@ opts = [
]
cfg.CONF.register_cli_opts(opts)
cfg.CONF(sys.argv[1:], project='heat', prog='heat-keystone-setup-domain')
cfg.CONF(sys.argv[1:],
project='heat',
prog='heat-keystone-setup-domain',
version=version.version_info.version_string())
HEAT_DOMAIN_NAME = os.environ.get(
'HEAT_DOMAIN', cfg.CONF.stack_user_domain_name)