From: Yong Sheng Gong Date: Wed, 26 Jun 2013 08:46:39 +0000 (+0800) Subject: move database config items into quantum.conf X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=74419faacf93a5e22ff6bd3f033a7fbd1c99a223;p=openstack-build%2Fneutron-build.git 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 --- diff --git a/etc/quantum.conf b/etc/quantum.conf index 5b95f8f3e..f613bd94e 100644 --- a/etc/quantum.conf +++ b/etc/quantum.conf @@ -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 = 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 diff --git a/etc/quantum/plugins/bigswitch/restproxy.ini b/etc/quantum/plugins/bigswitch/restproxy.ini index 4c5e72130..04168b17c 100644 --- a/etc/quantum/plugins/bigswitch/restproxy.ini +++ b/etc/quantum/plugins/bigswitch/restproxy.ini @@ -1,25 +1,5 @@ # 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] # All configuration for this plugin is in section '[restproxy]' # diff --git a/etc/quantum/plugins/brocade/brocade.ini b/etc/quantum/plugins/brocade/brocade.ini index 513304823..89dbe966e 100644 --- a/etc/quantum/plugins/brocade/brocade.ini +++ b/etc/quantum/plugins/brocade/brocade.ini @@ -10,18 +10,6 @@ # address = 10.24.84.38 # 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 = # diff --git a/etc/quantum/plugins/cisco/cisco_plugins.ini b/etc/quantum/plugins/cisco/cisco_plugins.ini index 6c7384c69..10b4e9a30 100644 --- a/etc/quantum/plugins/cisco/cisco_plugins.ini +++ b/etc/quantum/plugins/cisco/cisco_plugins.ini @@ -34,12 +34,3 @@ host=testhost # username=admin # 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 diff --git a/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini b/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini index f9970380d..77302dadb 100644 --- a/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini +++ b/etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini @@ -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] # (StrOpt) Type of network to allocate for tenant networks. The # default value 'local' is useful only for single-box testing and diff --git a/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini b/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini index 6b74fb67b..fb1825842 100644 --- a/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini +++ b/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini @@ -20,26 +20,6 @@ # network_vlan_ranges = # 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] # (ListOpt) Comma-separated list of # : tuples mapping physical diff --git a/etc/quantum/plugins/metaplugin/metaplugin.ini b/etc/quantum/plugins/metaplugin/metaplugin.ini index 702b76f9b..62264af92 100644 --- a/etc/quantum/plugins/metaplugin/metaplugin.ini +++ b/etc/quantum/plugins/metaplugin/metaplugin.ini @@ -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] ## This is list of flavor:quantum_plugins diff --git a/etc/quantum/plugins/midonet/midonet.ini b/etc/quantum/plugins/midonet/midonet.ini index 2132474c2..ebe228249 100644 --- a/etc/quantum/plugins/midonet/midonet.ini +++ b/etc/quantum/plugins/midonet/midonet.ini @@ -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 API server URI diff --git a/etc/quantum/plugins/ml2/ml2_conf.ini b/etc/quantum/plugins/ml2/ml2_conf.ini index 882b1f53f..a7fc6478f 100644 --- a/etc/quantum/plugins/ml2/ml2_conf.ini +++ b/etc/quantum/plugins/ml2/ml2_conf.ini @@ -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] # (ListOpt) List of network type driver entrypoints to be loaded from diff --git a/etc/quantum/plugins/mlnx/mlnx_conf.ini b/etc/quantum/plugins/mlnx/mlnx_conf.ini index 973cf0cc8..65f3db9a8 100644 --- a/etc/quantum/plugins/mlnx/mlnx_conf.ini +++ b/etc/quantum/plugins/mlnx/mlnx_conf.ini @@ -18,19 +18,6 @@ # network_vlan_ranges = # 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] # (ListOpt) Comma-separated list of # : tuples mapping physical diff --git a/etc/quantum/plugins/nec/nec.ini b/etc/quantum/plugins/nec/nec.ini index e2b59ce1d..24ad9d4f5 100644 --- a/etc/quantum/plugins/nec/nec.ini +++ b/etc/quantum/plugins/nec/nec.ini @@ -1,25 +1,5 @@ # 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] # 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. diff --git a/etc/quantum/plugins/nicira/nvp.ini b/etc/quantum/plugins/nicira/nvp.ini index 1cad74760..6187b3123 100644 --- a/etc/quantum/plugins/nicira/nvp.ini +++ b/etc/quantum/plugins/nicira/nvp.ini @@ -61,39 +61,6 @@ # interface name was not specified # 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] # number of network gateways allowed per tenant, -1 means unlimited # quota_network_gateway = 5 diff --git a/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini b/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini index 7df9a4ae1..b18da65a0 100644 --- a/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini +++ b/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini @@ -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] # (StrOpt) Type of network to allocate for tenant networks. The # default value 'local' is useful only for single-box testing and diff --git a/etc/quantum/plugins/plumgrid/plumgrid.ini b/etc/quantum/plugins/plumgrid/plumgrid.ini index a74693def..1c30ef67a 100644 --- a/etc/quantum/plugins/plumgrid/plumgrid.ini +++ b/etc/quantum/plugins/plumgrid/plumgrid.ini @@ -1,25 +1,5 @@ # Config file for Quantum PLUMgrid plugin -[database] -# This line MUST be changed to actually run the plugin. -# Example: -# connection = mysql://:@:3306/plumgrid_quantum -# Replace 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] # This line should be pointing to the NOS server, # for the PLUMgrid platform. In other deployments, diff --git a/etc/quantum/plugins/ryu/ryu.ini b/etc/quantum/plugins/ryu/ryu.ini index 573b9cebd..2cd3978b1 100644 --- a/etc/quantum/plugins/ryu/ryu.ini +++ b/etc/quantum/plugins/ryu/ryu.ini @@ -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://:@:/ -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] integration_bridge = br-int