b5990a7bd7
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. Remove the 'deps = pep8' from tox.ini as it means all the other deps get installed with easy_install which can't install oslo-config from the URL. Retain dummy cfg.py file until keystoneclient middleware has been updated (I18c450174277c8e2d15ed93879da6cd92074c27a). Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc
64 lines
2.0 KiB
Python
64 lines
2.0 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
#
|
|
# Copyright 2012 NEC Corporation. All rights reserved.
|
|
#
|
|
# 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.
|
|
# @author: Ryota MIBU
|
|
|
|
from oslo.config import cfg
|
|
|
|
from quantum.agent.common import config
|
|
# import rpc config options
|
|
from quantum.openstack.common import rpc
|
|
|
|
|
|
ovs_opts = [
|
|
cfg.StrOpt('integration_bridge', default='br-int',
|
|
help=_("Integration bridge to use")),
|
|
]
|
|
|
|
agent_opts = [
|
|
cfg.IntOpt('polling_interval', default=2,
|
|
help=_("The number of seconds the agent will wait between "
|
|
"polling for local device changes.")),
|
|
]
|
|
|
|
ofc_opts = [
|
|
cfg.StrOpt('host', default='127.0.0.1',
|
|
help=_("Host to connect to")),
|
|
cfg.StrOpt('port', default='8888',
|
|
help=_("Port to connect to")),
|
|
cfg.StrOpt('driver', default='trema',
|
|
help=_("Driver to use")),
|
|
cfg.BoolOpt('enable_packet_filter', default=True,
|
|
help=_("Enable packet filter")),
|
|
cfg.BoolOpt('use_ssl', default=False,
|
|
help=_("Use SSL to connect")),
|
|
cfg.StrOpt('key_file', default=None,
|
|
help=_("Key file")),
|
|
cfg.StrOpt('cert_file', default=None,
|
|
help=_("Certificate file")),
|
|
]
|
|
|
|
|
|
cfg.CONF.register_opts(ovs_opts, "OVS")
|
|
cfg.CONF.register_opts(agent_opts, "AGENT")
|
|
cfg.CONF.register_opts(ofc_opts, "OFC")
|
|
config.register_root_helper(cfg.CONF)
|
|
|
|
# shortcuts
|
|
CONF = cfg.CONF
|
|
OVS = cfg.CONF.OVS
|
|
AGENT = cfg.CONF.AGENT
|
|
OFC = cfg.CONF.OFC
|