Merge "Add sqlalchemy_pool_size option to default config files"

etc/quantum/plugins/bigswitch/restproxy.ini

@@ -22,6 +22,8 @@ reconnect_interval = 2
 # sql_max_pool_size = 5
 # Timeout in seconds before idle sql connections are reaped
 # sql_idle_timeout = 3600
+# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy
+# sqlalchemy_pool_size = 5
 
 [RESTPROXY]
 # All configuration for this plugin is in section '[restproxy]'

etc/quantum/plugins/brocade/brocade.ini

@@ -21,6 +21,8 @@
 # sql_max_pool_size = 5
 # Timeout in seconds before idle sql connections are reaped
 # sql_idle_timeout = 3600
+# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy
+# sqlalchemy_pool_size = 5
 #
 # Example:
 # sql_connection = mysql://root:pass@localhost/brcd_quantum?charset=utf8

etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini

@@ -20,6 +20,8 @@ reconnect_interval = 2
 # sql_max_pool_size = 5
 # Timeout in seconds before idle sql connections are reaped
 # sql_idle_timeout = 3600
+# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy
+# sqlalchemy_pool_size = 5
 
 [HYPERV]
 # (StrOpt) Type of network to allocate for tenant networks. The

etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini

@@ -42,6 +42,8 @@ reconnect_interval = 2
 # sql_max_pool_size = 5
 # Timeout in seconds before idle sql connections are reaped
 # sql_idle_timeout = 3600
+# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy
+# sqlalchemy_pool_size = 5
 
 [LINUX_BRIDGE]
 # (ListOpt) Comma-separated list of

etc/quantum/plugins/metaplugin/metaplugin.ini

@@ -22,6 +22,8 @@ reconnect_interval = 2
 # sql_max_pool_size = 5
 # Timeout in seconds before idle sql connections are reaped
 # sql_idle_timeout = 3600
+# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy
+# sqlalchemy_pool_size = 5
 
 [META]
 ## This is list of flavor:quantum_plugins

etc/quantum/plugins/midonet/midonet.ini

@@ -20,6 +20,8 @@ reconnect_interval = 2
 # sql_max_pool_size = 5
 # Timeout in seconds before idle sql connections are reaped
 # sql_idle_timeout = 3600
+# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy
+# sqlalchemy_pool_size = 5
 
 [MIDONET]
 # MidoNet API server URI

etc/quantum/plugins/nec/nec.ini

@@ -22,6 +22,8 @@ reconnect_interval = 2
 # sql_max_pool_size = 5
 # Timeout in seconds before idle sql connections are reaped
 # sql_idle_timeout = 3600
+# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy
+# sqlalchemy_pool_size = 5
 
 [ovs]
 # Do not change this parameter unless you have a good reason to.

etc/quantum/plugins/nicira/nvp.ini

@@ -90,6 +90,9 @@ sql_connection = sqlite://
 # Timeout in seconds before idle sql connections are reaped
 # sql_idle_timeout = 3600
 
+# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy
+# sqlalchemy_pool_size = 5
+
 
 [quotas]
 # number of network gateways allowed per tenant, -1 means unlimited

etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini

@@ -20,6 +20,8 @@ reconnect_interval = 2
 # sql_max_pool_size = 5
 # Timeout in seconds before idle sql connections are reaped
 # sql_idle_timeout = 3600
+# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy
+# sqlalchemy_pool_size = 5
 
 [ovs]
 # (StrOpt) Type of network to allocate for tenant networks. The

etc/quantum/plugins/plumgrid/plumgrid.ini

@@ -22,6 +22,8 @@
 # sql_max_pool_size = 5
 # Timeout in seconds before idle sql connections are reaped
 # sql_idle_timeout = 3600
+# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy
+# sqlalchemy_pool_size = 5
 
 [PLUMgridNOS]
 # This line should be pointing to the NOS server,

etc/quantum/plugins/ryu/ryu.ini

@@ -12,6 +12,8 @@ sql_connection = sqlite://
 # sql_max_pool_size = 5
 # Timeout in seconds before idle sql connections are reaped
 # sql_idle_timeout = 3600
+# Maximum number of SQL connections to keep open in a QueuePool in SQLAlchemy
+# sqlalchemy_pool_size = 5
 
 [ovs]
 integration_bridge = br-int