092aad40bd
Things changed, and the configuration wasn't read anymore. This patch fixes that. It also remove duplicated code in acl.py, so the problem is fixed only in one place. Finally, it uses prepare_service() to find the right configuration file for ceilometer. This fixes bug #1098204 Change-Id: I0d6c30ad443a4d0db201e60d12b275625a4bee6e Signed-off-by: Julien Danjou <julien@danjou.info>
71 lines
2.2 KiB
Python
Executable File
71 lines
2.2 KiB
Python
Executable File
#!/usr/bin/env python
|
|
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012 New Dream Network, LLC (DreamHost)
|
|
#
|
|
# Author: Doug Hellmann <doug.hellmann@dreamhost.com>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
"""Set up the development API server.
|
|
"""
|
|
import os
|
|
import sys
|
|
from wsgiref import simple_server
|
|
|
|
from pecan import configuration
|
|
|
|
from ceilometer.api import acl
|
|
from ceilometer.api import app
|
|
from ceilometer import service
|
|
from ceilometer.api import config as api_config
|
|
from ceilometer.openstack.common import cfg
|
|
from ceilometer.openstack.common import log as logging
|
|
|
|
|
|
if __name__ == '__main__':
|
|
# Register keystone middleware option before
|
|
# parsing the config file and command line
|
|
# inputs.
|
|
acl.register_opts(cfg.CONF)
|
|
|
|
# Parse OpenStack config file and command line options, then
|
|
# configure logging.
|
|
service.prepare_service()
|
|
|
|
# Set up the pecan configuration
|
|
filename = api_config.__file__.replace('.pyc', '.py')
|
|
pecan_config = configuration.conf_from_file(filename)
|
|
|
|
# Build the WSGI app
|
|
root = app.setup_app(pecan_config,
|
|
extra_hooks=[acl.AdminAuthHook()])
|
|
root = acl.install(root, cfg.CONF)
|
|
|
|
# Create the WSGI server and start it
|
|
host, port = '0.0.0.0', int(cfg.CONF.metering_api_port)
|
|
srv = simple_server.make_server(host, port, root)
|
|
|
|
print 'Starting server in PID %s' % os.getpid()
|
|
|
|
if host == '0.0.0.0':
|
|
print 'serving on 0.0.0.0:%s, view at http://127.0.0.1:%s' % \
|
|
(port, port)
|
|
else:
|
|
print "serving on http://%s:%s" % (host, port)
|
|
|
|
try:
|
|
srv.serve_forever()
|
|
except KeyboardInterrupt:
|
|
# allow CTRL+C to shutdown without an error
|
|
pass
|