dcbeee67d9
Currently agent schedulers options are defined in neutron.scheduler and every plugin that supports scheduling should register them individually. It is reasonable to define and register options in one place - agentschedulers_db. Fixes NeutronManagerTestCase when running separately by importing missing config option Fixes bug 1198904 Change-Id: Ia9c1ad3fb4b71796401ef5507f741f3cc024a4da
59 lines
2.1 KiB
Python
59 lines
2.1 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
#
|
|
# Copyright 2012 Cisco Systems, Inc. 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: Sumit Naiksatam, Cisco Systems, Inc.
|
|
# @author: Rohit Agarwalla, Cisco Systems, Inc.
|
|
|
|
from oslo.config import cfg
|
|
|
|
from neutron.agent.common import config
|
|
|
|
DEFAULT_VLAN_RANGES = []
|
|
DEFAULT_INTERFACE_MAPPINGS = []
|
|
|
|
|
|
vlan_opts = [
|
|
cfg.StrOpt('tenant_network_type', default='local',
|
|
help=_("Network type for tenant networks "
|
|
"(local, vlan, or none)")),
|
|
cfg.ListOpt('network_vlan_ranges',
|
|
default=DEFAULT_VLAN_RANGES,
|
|
help=_("List of <physical_network>:<vlan_min>:<vlan_max> "
|
|
"or <physical_network>")),
|
|
]
|
|
|
|
bridge_opts = [
|
|
cfg.ListOpt('physical_interface_mappings',
|
|
default=DEFAULT_INTERFACE_MAPPINGS,
|
|
help=_("List of <physical_network>:<physical_interface>")),
|
|
]
|
|
|
|
agent_opts = [
|
|
cfg.IntOpt('polling_interval', default=2,
|
|
help=_("The number of seconds the agent will wait between "
|
|
"polling for local device changes.")),
|
|
#TODO(rkukura): Change default to False before havana rc1
|
|
cfg.BoolOpt('rpc_support_old_agents', default=True,
|
|
help=_("Enable server RPC compatibility with old agents")),
|
|
]
|
|
|
|
|
|
cfg.CONF.register_opts(vlan_opts, "VLANS")
|
|
cfg.CONF.register_opts(bridge_opts, "LINUX_BRIDGE")
|
|
cfg.CONF.register_opts(agent_opts, "AGENT")
|
|
config.register_agent_state_opts_helper(cfg.CONF)
|
|
config.register_root_helper(cfg.CONF)
|