5181724ece
The cfg API is now available via the oslo-config library, so switch to
it and remove the copied-and-pasted version.
Add the 2013.1b3 tarball to tools/pip-requires - this will be changed
to 'oslo-config>=2013.1' when oslo-config is published to pypi. This
will happen in time for grizzly final.
For each testenv in tox.ini which overrides the base testenv deps list,
explicitly include {pip,test}-requires in the list so that oslo-config
doesn't fail to install later when easy_install attempts to install
the tarball when doing 'python setup.py install'.
Retain dummy cfg.py file until keystoneclient middleware has been
updated (I18c450174277c8e2d15ed93879da6cd92074c27a).
Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
37 lines
1.2 KiB
Python
37 lines
1.2 KiB
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.
|
|
|
|
import flask.helpers
|
|
from oslo.config import cfg
|
|
|
|
from ceilometer.openstack.common import jsonutils
|
|
|
|
# Replace the json module used by flask with the one from
|
|
# openstack.common so we can take advantage of the fact that it knows
|
|
# how to serialize more complex objects.
|
|
flask.helpers.json = jsonutils
|
|
|
|
# Register options for the service
|
|
API_SERVICE_OPTS = [
|
|
cfg.IntOpt('metering_api_port',
|
|
default=8777,
|
|
help='The port for the ceilometer API server',
|
|
),
|
|
]
|
|
cfg.CONF.register_opts(API_SERVICE_OPTS)
|