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
66 lines
2.5 KiB
Python
66 lines
2.5 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
|
|
|
|
|
|
DEFAULT_BRIDGE_MAPPINGS = []
|
|
DEFAULT_VLAN_RANGES = []
|
|
DEFAULT_TUNNEL_RANGES = []
|
|
|
|
ovs_opts = [
|
|
cfg.StrOpt('integration_bridge', default='br-int',
|
|
help=_("Integration bridge to use")),
|
|
cfg.BoolOpt('enable_tunneling', default=False,
|
|
help=_("Enable tunneling support")),
|
|
cfg.StrOpt('tunnel_bridge', default='br-tun',
|
|
help=_("Tunnel bridge to use")),
|
|
cfg.StrOpt('int_peer_patch_port', default='patch-tun',
|
|
help=_("Peer patch port in integration bridge for tunnel "
|
|
"bridge")),
|
|
cfg.StrOpt('tun_peer_patch_port', default='patch-int',
|
|
help=_("Peer patch port in tunnel bridge for integration "
|
|
"bridge")),
|
|
cfg.StrOpt('local_ip', default='',
|
|
help=_("Local IP address of GRE tunnel endpoints.")),
|
|
cfg.ListOpt('bridge_mappings',
|
|
default=DEFAULT_BRIDGE_MAPPINGS,
|
|
help=_("List of <physical_network>:<bridge>")),
|
|
cfg.StrOpt('tenant_network_type', default='local',
|
|
help=_("Network type for tenant networks "
|
|
"(local, vlan, gre, or none)")),
|
|
cfg.ListOpt('network_vlan_ranges',
|
|
default=DEFAULT_VLAN_RANGES,
|
|
help=_("List of <physical_network>:<vlan_min>:<vlan_max> "
|
|
"or <physical_network>")),
|
|
cfg.ListOpt('tunnel_id_ranges',
|
|
default=DEFAULT_TUNNEL_RANGES,
|
|
help=_("List of <tun_min>:<tun_max>")),
|
|
]
|
|
|
|
agent_opts = [
|
|
cfg.IntOpt('polling_interval', default=2,
|
|
help=_("The number of seconds the agent will wait between "
|
|
"polling for local device changes.")),
|
|
]
|
|
|
|
|
|
cfg.CONF.register_opts(ovs_opts, "OVS")
|
|
cfg.CONF.register_opts(agent_opts, "AGENT")
|
|
config.register_root_helper(cfg.CONF)
|