openstack
/
heat
Code Issues Proposed changes

Use pbr for installing wsgi scripts 

Change-Id: Ia4f6536336d860b62be6fd42465cf63d59fe2760
Closes-Bug: #1500569
This commit is contained in:
Oleksii Chuprykov 2015-09-28 22:01:36 +03:00
parent 1af66c5da2
commit be613de636
5 changed files with 54 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
heat/httpd/__init__.py Normal file
View File

29
heat/httpd/heat-api.py → heat/httpd/heat_api.py
View File

@ -26,22 +26,23 @@ from heat.common import config
from heat.common.i18n import _LI
from heat.common import messaging
from heat.common import profiler
from heat import version
from heat import version as hversion
i18n.enable_lazy()
LOG = logging.getLogger('heat.api')
def init_application():
i18n.enable_lazy()
logging.register_options(cfg.CONF)
version = version.version_info.version_string()
cfg.CONF(project='heat', prog='heat-api', version=version)
logging.setup(cfg.CONF, 'heat-api')
messaging.setup()
LOG = logging.getLogger('heat.api')
port = cfg.CONF.heat_api.bind_port
host = cfg.CONF.heat_api.bind_host
LOG.info(_LI('Starting Heat REST API on %(host)s:%(port)s'),
{'host': host, 'port': port})
profiler.setup('heat-api', host)
logging.register_options(cfg.CONF)
version = hversion.version_info.version_string()
cfg.CONF(project='heat', prog='heat-api', version=version)
logging.setup(cfg.CONF, 'heat-api')
messaging.setup()
application = config.load_paste_app()
port = cfg.CONF.heat_api.bind_port
host = cfg.CONF.heat_api.bind_host
profiler.setup('heat-api', host)
LOG.info(_LI('Starting Heat REST API on %(host)s:%(port)s'),
{'host': host, 'port': port})
return config.load_paste_app()

32
heat/httpd/heat-api-cfn.py → heat/httpd/heat_api_cfn.py
View File

@ -28,22 +28,24 @@ from heat.common import messaging
from heat.common import profiler
from heat import version
i18n.enable_lazy()
LOG = logging.getLogger('heat.api.cfn')
def init_application():
i18n.enable_lazy()
logging.register_options(cfg.CONF)
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()
LOG = logging.getLogger('heat.api.cfn')
port = cfg.CONF.heat_api_cfn.bind_port
host = cfg.CONF.heat_api_cfn.bind_host
LOG.info(_LI('Starting Heat API on %(host)s:%(port)s'),
{'host': host, 'port': port})
profiler.setup('heat-api-cfn', host)
logging.register_options(cfg.CONF)
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()
application = config.load_paste_app()
port = cfg.CONF.heat_api_cfn.bind_port
host = cfg.CONF.heat_api_cfn.bind_host
LOG.info(_LI('Starting Heat API on %(host)s:%(port)s'),
{'host': host, 'port': port})
profiler.setup('heat-api-cfn', host)
return config.load_paste_app()

32
heat/httpd/heat-api-cloudwatch.py → heat/httpd/heat_api_cloudwatch.py
View File

@ -28,22 +28,24 @@ from heat.common import messaging
from heat.common import profiler
from heat import version
i18n.enable_lazy()
LOG = logging.getLogger('heat.api.cloudwatch')
def init_application():
i18n.enable_lazy()
logging.register_options(cfg.CONF)
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()
LOG = logging.getLogger('heat.api.cloudwatch')
port = cfg.CONF.heat_api_cloudwatch.bind_port
host = cfg.CONF.heat_api_cloudwatch.bind_host
LOG.info(_LI('Starting Heat CloudWatch API on %(host)s:%(port)s'),
{'host': host, 'port': port})
profiler.setup('heat-api-cloudwatch', host)
logging.register_options(cfg.CONF)
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()
application = config.load_paste_app()
port = cfg.CONF.heat_api_cloudwatch.bind_port
host = cfg.CONF.heat_api_cloudwatch.bind_host
LOG.info(_LI('Starting Heat CloudWatch API on %(host)s:%(port)s'),
{'host': host, 'port': port})
profiler.setup('heat-api-cloudwatch', host)
return config.load_paste_app()

5
setup.cfg
View File

@ -35,6 +35,11 @@ console_scripts =
heat-engine = heat.cmd.engine:main
heat-manage = heat.cmd.manage:main
wsgi_scripts =
heat-wsgi-api = heat.httpd.heat_api:init_application
heat-wsgi-api-cfn = heat.httpd.heat_api_cfn:init_application
heat-wsgi-api-cloudwatch = heat.httpd.heat_api_cloudwatch:init_application
oslo.config.opts =
heat.common.config = heat.common.config:list_opts
heat.common.crypt = heat.common.crypt:list_opts