move database config items into quantum.conf
Bug #1194784 This patch syncs all the DB configuration items into quantum.conf and removes the related items of plugins' config file to avoid duplication. sqlite related sqlite_db and sqlite_synchronous are defined in 'default' section, which I think is a defect. And it seems quantum does not use sqlite_db item. Change-Id: Ia47102ced0e4169f45f10b85311f298d8c026d31
This commit is contained in:
@@ -323,3 +323,43 @@ signing_dir = /var/lib/quantum/keystone-signing
|
|||||||
# driver_fqn is the fully qualified name of the lbaas driver that will be loaded by the lbass plugin
|
# driver_fqn is the fully qualified name of the lbaas driver that will be loaded by the lbass plugin
|
||||||
# ==================================================================================================
|
# ==================================================================================================
|
||||||
#driver_fqn = quantum.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver
|
#driver_fqn = quantum.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver
|
||||||
|
|
||||||
|
[database]
|
||||||
|
# This line MUST be changed to actually run the plugin.
|
||||||
|
# Example:
|
||||||
|
# connection = mysql://root:pass@127.0.0.1:3306/quantum
|
||||||
|
# Replace 127.0.0.1 above with the IP address of the database used by the
|
||||||
|
# main quantum server. (Leave it as is if the database runs on this host.)
|
||||||
|
# connection = sqlite://
|
||||||
|
|
||||||
|
# The SQLAlchemy connection string used to connect to the slave database
|
||||||
|
# slave_connection =
|
||||||
|
|
||||||
|
# Database reconnection retry times - in event connectivity is lost
|
||||||
|
# set to -1 implies an infinite retry count
|
||||||
|
# max_retries = 10
|
||||||
|
|
||||||
|
# Database reconnection interval in seconds - if the initial connection to the
|
||||||
|
# database fails
|
||||||
|
# retry_interval = 10
|
||||||
|
|
||||||
|
# Minimum number of SQL connections to keep open in a pool
|
||||||
|
# min_pool_size = 1
|
||||||
|
|
||||||
|
# Maximum number of SQL connections to keep open in a pool
|
||||||
|
# max_pool_size = 10
|
||||||
|
|
||||||
|
# Timeout in seconds before idle sql connections are reaped
|
||||||
|
# idle_timeout = 3600
|
||||||
|
|
||||||
|
# If set, use this value for max_overflow with sqlalchemy
|
||||||
|
# max_overflow = 20,
|
||||||
|
|
||||||
|
# Verbosity of SQL debugging information. 0=None, 100=Everything
|
||||||
|
# connection_debug = 0
|
||||||
|
|
||||||
|
# Add python stack traces to SQL as comment strings
|
||||||
|
# connection_trace = False,
|
||||||
|
|
||||||
|
# If set, use this value for pool_timeout with sqlalchemy
|
||||||
|
# pool_timeout = 10
|
||||||
|
@@ -1,25 +1,5 @@
|
|||||||
# Config file for quantum-proxy-plugin.
|
# Config file for quantum-proxy-plugin.
|
||||||
|
|
||||||
[database]
|
|
||||||
# This line MUST be changed to actually run the plugin.
|
|
||||||
# Example:
|
|
||||||
# connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum
|
|
||||||
# Replace 127.0.0.1 above with the IP address of the database used by the
|
|
||||||
# main quantum server. (Leave it as is if the database runs on this host.)
|
|
||||||
connection = sqlite://
|
|
||||||
# Database reconnection retry times - in event connectivity is lost
|
|
||||||
# set to -1 implies an infinite retry count
|
|
||||||
# max_retries = 10
|
|
||||||
# Database reconnection interval in seconds - if the initial connection to the
|
|
||||||
# database fails
|
|
||||||
retry_interval = 2
|
|
||||||
# Minimum number of SQL connections to keep open in a pool
|
|
||||||
# min_pool_size = 1
|
|
||||||
# Maximum number of SQL connections to keep open in a pool
|
|
||||||
# max_pool_size = 5
|
|
||||||
# Timeout in seconds before idle sql connections are reaped
|
|
||||||
# idle_timeout = 3600
|
|
||||||
|
|
||||||
[restproxy]
|
[restproxy]
|
||||||
# All configuration for this plugin is in section '[restproxy]'
|
# All configuration for this plugin is in section '[restproxy]'
|
||||||
#
|
#
|
||||||
|
@@ -10,18 +10,6 @@
|
|||||||
# address = 10.24.84.38
|
# address = 10.24.84.38
|
||||||
# ostype = NOS
|
# ostype = NOS
|
||||||
|
|
||||||
[database]
|
|
||||||
# connection = sqlite://
|
|
||||||
# Minimum number of SQL connections to keep open in a pool
|
|
||||||
# min_pool_size = 1
|
|
||||||
# Maximum number of SQL connections to keep open in a pool
|
|
||||||
# max_pool_size = 5
|
|
||||||
# Timeout in seconds before idle sql connections are reaped
|
|
||||||
# idle_timeout = 3600
|
|
||||||
#
|
|
||||||
# Example:
|
|
||||||
# connection = mysql://root:pass@localhost/brcd_quantum?charset=utf8
|
|
||||||
|
|
||||||
[physical_interface]
|
[physical_interface]
|
||||||
# physical_interface = <physical network name>
|
# physical_interface = <physical network name>
|
||||||
#
|
#
|
||||||
|
@@ -34,12 +34,3 @@ host=testhost
|
|||||||
# username=admin
|
# username=admin
|
||||||
# password=mySecretPassword
|
# password=mySecretPassword
|
||||||
|
|
||||||
[database]
|
|
||||||
#
|
|
||||||
# This line MUST be changed to actually run the plugin.
|
|
||||||
# Example:
|
|
||||||
# connection = mysql://quantum:password@127.0.0.1:3306/cisco_quantum
|
|
||||||
# Replace 127.0.0.1 above with the IP address of the database used by the
|
|
||||||
# main quantum server. (Leave it as is if the database runs on this host.)
|
|
||||||
#
|
|
||||||
# connection=engine://user:pass@host/db_name
|
|
||||||
|
@@ -1,23 +1,3 @@
|
|||||||
[database]
|
|
||||||
# This line MUST be changed to actually run the plugin.
|
|
||||||
# Example:
|
|
||||||
# connection = mysql://quantum:password@127.0.0.1:3306/hyperv_quantum
|
|
||||||
# Replace 127.0.0.1 above with the IP address of the database used by the
|
|
||||||
# main quantum server. (Leave it as is if the database runs on this host.)
|
|
||||||
connection = sqlite://
|
|
||||||
# Database reconnection retry times - in event connectivity is lost
|
|
||||||
# set to -1 implies an infinite retry count
|
|
||||||
# max_retries = 10
|
|
||||||
# Database reconnection interval in seconds - if the initial connection to the
|
|
||||||
# database fails
|
|
||||||
retry_interval = 2
|
|
||||||
# Minimum number of SQL connections to keep open in a pool
|
|
||||||
# min_pool_size = 1
|
|
||||||
# Maximum number of SQL connections to keep open in a pool
|
|
||||||
# max_pool_size = 5
|
|
||||||
# Timeout in seconds before idle sql connections are reaped
|
|
||||||
# idle_timeout = 3600
|
|
||||||
|
|
||||||
[hyperv]
|
[hyperv]
|
||||||
# (StrOpt) Type of network to allocate for tenant networks. The
|
# (StrOpt) Type of network to allocate for tenant networks. The
|
||||||
# default value 'local' is useful only for single-box testing and
|
# default value 'local' is useful only for single-box testing and
|
||||||
|
@@ -20,26 +20,6 @@
|
|||||||
# network_vlan_ranges =
|
# network_vlan_ranges =
|
||||||
# Example: network_vlan_ranges = physnet1:1000:2999
|
# Example: network_vlan_ranges = physnet1:1000:2999
|
||||||
|
|
||||||
[database]
|
|
||||||
# This line MUST be changed to actually run the plugin.
|
|
||||||
# Example:
|
|
||||||
# connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
|
|
||||||
# Replace 127.0.0.1 above with the IP address of the database used by the
|
|
||||||
# main quantum server. (Leave it as is if the database runs on this host.)
|
|
||||||
connection = sqlite://
|
|
||||||
# Database reconnection retry times - in event connectivity is lost
|
|
||||||
# set to -1 implies an infinite retry count
|
|
||||||
# max_retries = 10
|
|
||||||
# Database reconnection interval in seconds - if the initial connection to the
|
|
||||||
# database fails
|
|
||||||
retry_interval = 2
|
|
||||||
# Minimum number of SQL connections to keep open in a pool
|
|
||||||
# min_pool_size = 1
|
|
||||||
# Maximum number of SQL connections to keep open in a pool
|
|
||||||
# max_pool_size = 5
|
|
||||||
# Timeout in seconds before idle sql connections are reaped
|
|
||||||
# idle_timeout = 3600
|
|
||||||
|
|
||||||
[linux_bridge]
|
[linux_bridge]
|
||||||
# (ListOpt) Comma-separated list of
|
# (ListOpt) Comma-separated list of
|
||||||
# <physical_network>:<physical_interface> tuples mapping physical
|
# <physical_network>:<physical_interface> tuples mapping physical
|
||||||
|
@@ -1,24 +1,3 @@
|
|||||||
[database]
|
|
||||||
# This line MUST be changed to actually run the plugin.
|
|
||||||
# Example:
|
|
||||||
# connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
|
|
||||||
# Replace 127.0.0.1 above with the IP address of the database used by the
|
|
||||||
# main quantum server. (Leave it as is if the database runs on this host.)
|
|
||||||
connection = mysql://root:password@localhost/quantum_metaplugin?charset=utf8
|
|
||||||
|
|
||||||
# Database reconnection retry times - in event connectivity is lost
|
|
||||||
# set to -1 implgies an infinite retry count
|
|
||||||
# max_retries = 10
|
|
||||||
# Database reconnection interval in seconds - if the initial connection to the
|
|
||||||
# database fails
|
|
||||||
retry_interval = 2
|
|
||||||
|
|
||||||
# Minimum number of SQL connections to keep open in a pool
|
|
||||||
# min_pool_size = 1
|
|
||||||
# Maximum number of SQL connections to keep open in a pool
|
|
||||||
# max_pool_size = 5
|
|
||||||
# Timeout in seconds before idle sql connections are reaped
|
|
||||||
# idle_timeout = 3600
|
|
||||||
|
|
||||||
[meta]
|
[meta]
|
||||||
## This is list of flavor:quantum_plugins
|
## This is list of flavor:quantum_plugins
|
||||||
|
@@ -1,22 +1,3 @@
|
|||||||
[database]
|
|
||||||
# This line MUST be changed to actually run the plugin.
|
|
||||||
# Example:
|
|
||||||
# connection = mysql://root:pass@127.0.0.1:3306/midonet_quantum
|
|
||||||
# Replace 127.0.0.1 above with the IP address of the database used by the
|
|
||||||
# main quantum server. (Leave it as is if the database runs on this host.)
|
|
||||||
connection = sqlite://
|
|
||||||
# Database reconnection retry times - in event connectivity is lost
|
|
||||||
# set to -1 implies an infinite retry count
|
|
||||||
# max_retries = 10
|
|
||||||
# Database reconnection interval in seconds - if the initial connection to the
|
|
||||||
# database fails
|
|
||||||
retry_interval = 2
|
|
||||||
# Minimum number of SQL connections to keep open in a pool
|
|
||||||
# min_pool_size = 1
|
|
||||||
# Maximum number of SQL connections to keep open in a pool
|
|
||||||
# max_pool_size = 5
|
|
||||||
# Timeout in seconds before idle sql connections are reaped
|
|
||||||
# idle_timeout = 3600
|
|
||||||
|
|
||||||
[midonet]
|
[midonet]
|
||||||
# MidoNet API server URI
|
# MidoNet API server URI
|
||||||
|
@@ -1,44 +1,3 @@
|
|||||||
[database]
|
|
||||||
# (StrOpt) SQLAlchemy database connection string. This MUST be changed
|
|
||||||
# to actually run the plugin with persistent storage.
|
|
||||||
#
|
|
||||||
# connection = sqlite://
|
|
||||||
# Example: connection = mysql://root:password@localhost/quantum_ml2?charset=utf8
|
|
||||||
|
|
||||||
# (IntOpt) Database reconnection retry limit after database
|
|
||||||
# connectivity is lost. Value of -1 specifies infinite retry limit.
|
|
||||||
#
|
|
||||||
# max_retries = 10
|
|
||||||
# Example: max_retries = -1
|
|
||||||
|
|
||||||
# (IntOpt) Database reconnection interval in seconds after the initial
|
|
||||||
# connection to the database fails.
|
|
||||||
#
|
|
||||||
# retry_interval = 2
|
|
||||||
# Example: retry_interval = 10
|
|
||||||
|
|
||||||
# (IntOpt) Minimum number of MySQL connections to keep open in a pool.
|
|
||||||
#
|
|
||||||
# min_pool_size = 1
|
|
||||||
# Example: min_pool_size = 5
|
|
||||||
|
|
||||||
# (IntOpt) Maximum number of MySQL connections to keep open in a pool.
|
|
||||||
#
|
|
||||||
# max_pool_size =
|
|
||||||
# Example: sql_max_pool_size = 20
|
|
||||||
|
|
||||||
# (IntOpt) Timeout in seconds before idle MySQL connections are
|
|
||||||
# reaped.
|
|
||||||
#
|
|
||||||
# idle_timeout = 3600
|
|
||||||
# Example: idle_timeout = 6000
|
|
||||||
|
|
||||||
# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy
|
|
||||||
# Example sqlalchemy_pool_size = 5
|
|
||||||
# Maximum number of overflow connections in a QueuePool in SQLAlchemy
|
|
||||||
# Example sqlalchemy_max_overflow = 10
|
|
||||||
# Timeout of the open connections QueuePool in SQLAlchemy
|
|
||||||
# Example sqlalchemy_pool_timeout = 30
|
|
||||||
|
|
||||||
[ml2]
|
[ml2]
|
||||||
# (ListOpt) List of network type driver entrypoints to be loaded from
|
# (ListOpt) List of network type driver entrypoints to be loaded from
|
||||||
|
@@ -18,19 +18,6 @@
|
|||||||
# network_vlan_ranges =
|
# network_vlan_ranges =
|
||||||
# Example: network_vlan_ranges = default:1:100
|
# Example: network_vlan_ranges = default:1:100
|
||||||
|
|
||||||
[database]
|
|
||||||
# This line MUST be changed to actually run the plugin.
|
|
||||||
# Example:
|
|
||||||
# connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge
|
|
||||||
# Replace 127.0.0.1 above with the IP address of the database used by the
|
|
||||||
# main quantum server. (Leave it as is if the database runs on this host.)
|
|
||||||
connection = sqlite://
|
|
||||||
# Database reconnection retry times - in event connectivity is lost
|
|
||||||
# set to -1 implies an infinite retry count
|
|
||||||
# max_retries = 10
|
|
||||||
# Database reconnection interval in seconds - in event connectivity is lost
|
|
||||||
retry_interval = 2
|
|
||||||
|
|
||||||
[eswitch]
|
[eswitch]
|
||||||
# (ListOpt) Comma-separated list of
|
# (ListOpt) Comma-separated list of
|
||||||
# <physical_network>:<physical_interface> tuples mapping physical
|
# <physical_network>:<physical_interface> tuples mapping physical
|
||||||
|
@@ -1,25 +1,5 @@
|
|||||||
# Sample Configurations
|
# Sample Configurations
|
||||||
|
|
||||||
[database]
|
|
||||||
# This line MUST be changed to actually run the plugin.
|
|
||||||
# Example:
|
|
||||||
# connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
|
|
||||||
# Replace 127.0.0.1 above with the IP address of the database used by the
|
|
||||||
# main quantum server. (Leave it as is if the database runs on this host.)
|
|
||||||
connection = sqlite://
|
|
||||||
# Database reconnection retry times - in event connectivity is lost
|
|
||||||
# set to -1 implies an infinite retry count
|
|
||||||
# max_retries = 10
|
|
||||||
# Database reconnection interval in seconds - if the initial connection to the
|
|
||||||
# database fails
|
|
||||||
retry_interval = 2
|
|
||||||
# Minimum number of SQL connections to keep open in a pool
|
|
||||||
# min_pool_size = 1
|
|
||||||
# Maximum number of SQL connections to keep open in a pool
|
|
||||||
# max_pool_size = 5
|
|
||||||
# Timeout in seconds before idle sql connections are reaped
|
|
||||||
# idle_timeout = 3600
|
|
||||||
|
|
||||||
[ovs]
|
[ovs]
|
||||||
# Do not change this parameter unless you have a good reason to.
|
# Do not change this parameter unless you have a good reason to.
|
||||||
# This is the name of the OVS integration bridge. There is one per hypervisor.
|
# This is the name of the OVS integration bridge. There is one per hypervisor.
|
||||||
|
@@ -61,39 +61,6 @@
|
|||||||
# interface name was not specified
|
# interface name was not specified
|
||||||
# default_iface_name = breth0
|
# default_iface_name = breth0
|
||||||
|
|
||||||
|
|
||||||
[database]
|
|
||||||
# This line MUST be changed to actually run the plugin.
|
|
||||||
# Example:
|
|
||||||
# connection = mysql://root:quantum@127.0.0.1:3306/nvp_quantum
|
|
||||||
# Replace 127.0.0.1 above with the IP address of the database used by the
|
|
||||||
# main quantum server. (Leave it as is if the database runs on this host.)
|
|
||||||
connection = sqlite://
|
|
||||||
|
|
||||||
# Number of reconnection attempts to the DB; Set to -1 to try indefinitely
|
|
||||||
# max_retries = 10
|
|
||||||
|
|
||||||
# Period between reconnection attempts to the DB
|
|
||||||
# retry_interval = 2
|
|
||||||
|
|
||||||
# Minimum number of SQL connections to keep open in a pool
|
|
||||||
# min_pool_size = 1
|
|
||||||
|
|
||||||
# Maximum number of SQL connections to keep open in a pool
|
|
||||||
# max_pool_size = 5
|
|
||||||
|
|
||||||
# Timeout in seconds before idle sql connections are reaped
|
|
||||||
# idle_timeout = 3600
|
|
||||||
|
|
||||||
# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy
|
|
||||||
# Example sqlalchemy_pool_size = 5
|
|
||||||
|
|
||||||
# Maximum number of overflow connections in a QueuePool in SQLAlchemy
|
|
||||||
# Example sqlalchemy_max_overflow = 10
|
|
||||||
|
|
||||||
# Timeout of the open connections QueuePool in SQLAlchemy
|
|
||||||
# Example sqlalchemy_pool_timeout = 30
|
|
||||||
|
|
||||||
[quotas]
|
[quotas]
|
||||||
# number of network gateways allowed per tenant, -1 means unlimited
|
# number of network gateways allowed per tenant, -1 means unlimited
|
||||||
# quota_network_gateway = 5
|
# quota_network_gateway = 5
|
||||||
|
@@ -1,23 +1,3 @@
|
|||||||
[database]
|
|
||||||
# This line MUST be changed to actually run the plugin.
|
|
||||||
# Example:
|
|
||||||
# connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum
|
|
||||||
# Replace 127.0.0.1 above with the IP address of the database used by the
|
|
||||||
# main quantum server. (Leave it as is if the database runs on this host.)
|
|
||||||
connection = sqlite://
|
|
||||||
# Database reconnection retry times - in event connectivity is lost
|
|
||||||
# set to -1 implies an infinite retry count
|
|
||||||
# max_retries = 10
|
|
||||||
# Database reconnection interval in seconds - if the initial connection to the
|
|
||||||
# database fails
|
|
||||||
retry_interval = 2
|
|
||||||
# Minimum number of SQL connections to keep open in a pool
|
|
||||||
# min_pool_size = 1
|
|
||||||
# Maximum number of SQL connections to keep open in a pool
|
|
||||||
# max_pool_size = 5
|
|
||||||
# Timeout in seconds before idle sql connections are reaped
|
|
||||||
# idle_timeout = 3600
|
|
||||||
|
|
||||||
[ovs]
|
[ovs]
|
||||||
# (StrOpt) Type of network to allocate for tenant networks. The
|
# (StrOpt) Type of network to allocate for tenant networks. The
|
||||||
# default value 'local' is useful only for single-box testing and
|
# default value 'local' is useful only for single-box testing and
|
||||||
|
@@ -1,25 +1,5 @@
|
|||||||
# Config file for Quantum PLUMgrid plugin
|
# Config file for Quantum PLUMgrid plugin
|
||||||
|
|
||||||
[database]
|
|
||||||
# This line MUST be changed to actually run the plugin.
|
|
||||||
# Example:
|
|
||||||
# connection = mysql://<user>:<pass>@<host>:3306/plumgrid_quantum
|
|
||||||
# Replace <host> above with the IP address of the database used by the
|
|
||||||
# main quantum server.
|
|
||||||
# connection = sqlite://
|
|
||||||
# Database reconnection retry times - in event connectivity is lost
|
|
||||||
# set to -1 implies an infinite retry count
|
|
||||||
# max_retries = 10
|
|
||||||
# Database reconnection interval in seconds - if the initial connection to the
|
|
||||||
# database fails
|
|
||||||
# retry_interval = 2
|
|
||||||
# Minimum number of SQL connections to keep open in a pool
|
|
||||||
# min_pool_size = 1
|
|
||||||
# Maximum number of SQL connections to keep open in a pool
|
|
||||||
# max_pool_size = 5
|
|
||||||
# Timeout in seconds before idle sql connections are reaped
|
|
||||||
# idle_timeout = 3600
|
|
||||||
|
|
||||||
[plumgridnos]
|
[plumgridnos]
|
||||||
# This line should be pointing to the NOS server,
|
# This line should be pointing to the NOS server,
|
||||||
# for the PLUMgrid platform. In other deployments,
|
# for the PLUMgrid platform. In other deployments,
|
||||||
|
@@ -1,14 +1,3 @@
|
|||||||
[database]
|
|
||||||
# This line MUST be changed to actually run the plugin.
|
|
||||||
# Example: connection = mysql://root:nova@127.0.0.1:3306/ryu_quantum
|
|
||||||
# connection = mysql://<user>:<pass>@<IP>:<port>/<dbname>
|
|
||||||
connection = sqlite://
|
|
||||||
# Minimum number of SQL connections to keep open in a pool
|
|
||||||
# min_pool_size = 1
|
|
||||||
# Maximum number of SQL connections to keep open in a pool
|
|
||||||
# max_pool_size = 5
|
|
||||||
# Timeout in seconds before idle sql connections are reaped
|
|
||||||
# idle_timeout = 3600
|
|
||||||
|
|
||||||
[ovs]
|
[ovs]
|
||||||
integration_bridge = br-int
|
integration_bridge = br-int
|
||||||
|
Reference in New Issue
Block a user