7b5f6fd6ae
This adds the use of eventlet's db_pool module so that we can make mysql calls without blocking the whole process. New config options are introduced: sql_dbpool_enable -- Enables the use of eventlet's db_pool sql_min_pool_size -- Set the minimum number of SQL connections sql_max_pool_size -- Set the maximum number of SQL connections sql_idle_timeout -- Timeout before idle sql connections are reaped The default for sql_dbpool_enable is False for now, so there is no forced behavior changes for those using mysql. sql_min_pool_size is defaulted to 1 to match behavior if not using db_pool. Fixes bug 1086173 Change-Id: Ied0aae33211585743fe955028a75c4e192a15d2f
73 lines
2.5 KiB
Python
73 lines
2.5 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 quantum.openstack.common import cfg
|
|
|
|
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>"),
|
|
]
|
|
|
|
database_opts = [
|
|
cfg.StrOpt('sql_connection', default='sqlite://'),
|
|
cfg.IntOpt('sql_max_retries', default=-1),
|
|
cfg.IntOpt('reconnect_interval', default=2),
|
|
cfg.IntOpt('sql_min_pool_size',
|
|
default=1,
|
|
help="Minimum number of SQL connections to keep open in a "
|
|
"pool"),
|
|
cfg.IntOpt('sql_max_pool_size',
|
|
default=5,
|
|
help="Maximum number of SQL connections to keep open in a "
|
|
"pool"),
|
|
cfg.IntOpt('sql_idle_timeout',
|
|
default=3600,
|
|
help="Timeout in seconds before idle sql connections are "
|
|
"reaped"),
|
|
cfg.BoolOpt('sql_dbpool_enable',
|
|
default=False,
|
|
help="Enable the use of eventlet's db_pool for MySQL"),
|
|
]
|
|
|
|
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),
|
|
cfg.StrOpt('root_helper', default='sudo'),
|
|
]
|
|
|
|
|
|
cfg.CONF.register_opts(vlan_opts, "VLANS")
|
|
cfg.CONF.register_opts(database_opts, "DATABASE")
|
|
cfg.CONF.register_opts(bridge_opts, "LINUX_BRIDGE")
|
|
cfg.CONF.register_opts(agent_opts, "AGENT")
|