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
46 lines
1.7 KiB
Python
46 lines
1.7 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012 Red Hat, Inc.
|
|
#
|
|
# 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.
|
|
|
|
from oslo.config import cfg
|
|
|
|
from quantum.agent.common import config
|
|
|
|
|
|
ovs_opts = [
|
|
cfg.StrOpt('integration_bridge', default='br-int',
|
|
help=_("Integration bridge to use")),
|
|
cfg.StrOpt('openflow_rest_api', default='127.0.0.1:8080',
|
|
help=_("OpenFlow REST API location")),
|
|
cfg.IntOpt('tunnel_key_min', default=1,
|
|
help=_("Minimum tunnel ID to use")),
|
|
cfg.IntOpt('tunnel_key_max', default=0xffffff,
|
|
help=_("Maximum tunnel ID to use")),
|
|
cfg.StrOpt('tunnel_ip', default=None,
|
|
help=_("Tunnel IP to use")),
|
|
cfg.StrOpt('tunnel_interface', default=None,
|
|
help=_("Tunnel interface to use")),
|
|
cfg.IntOpt('ovsdb_port', default=6634,
|
|
help=_("OVSDB port to connect to")),
|
|
cfg.StrOpt('ovsdb_ip', default=None,
|
|
help=_("OVSDB IP to connect to")),
|
|
cfg.StrOpt('ovsdb_interface', default=None,
|
|
help=_("OVSDB interface to connect to")),
|
|
]
|
|
|
|
|
|
cfg.CONF.register_opts(ovs_opts, "OVS")
|
|
config.register_root_helper(cfg.CONF)
|