From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 29 May 2013 11:00:38 +0000 (+0000)
Subject: Merge "Revert dependency on oslo.config 1.2.0"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=010bfa6234679b0ba1771f561b128a6957b1c240;p=openstack-build%2Fneutron-build.git

Merge "Revert dependency on oslo.config 1.2.0"
---

010bfa6234679b0ba1771f561b128a6957b1c240
diff --cc etc/quantum/plugins/nec/nec.ini
index a2e9900de,21737c505..22da0b03f
--- a/etc/quantum/plugins/nec/nec.ini
+++ b/etc/quantum/plugins/nec/nec.ini
@@@ -22,10 -22,8 +22,10 @@@ reconnect_interval = 
  # 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]
+ [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.
  # The integration bridge acts as a virtual "patch port". All VM VIFs are
diff --cc etc/quantum/plugins/nicira/nvp.ini
index ada807248,e46dc195e..c784f7bdf
--- a/etc/quantum/plugins/nicira/nvp.ini
+++ b/etc/quantum/plugins/nicira/nvp.ini
@@@ -90,11 -90,8 +90,11 @@@ 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]
+ [QUOTAS]
  # number of network gateways allowed per tenant, -1 means unlimited
  # quota_network_gateway = 5
  
diff --cc etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
index 22d829ad1,d0e1527b8..cc1d2d9ce
--- a/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
+++ b/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
@@@ -20,10 -20,8 +20,10 @@@ reconnect_interval = 
  # 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]
+ [OVS]
  # (StrOpt) Type of network to allocate for tenant networks. The
  # default value 'local' is useful only for single-box testing and
  # provides no connectivity between hosts. You MUST either change this
diff --cc etc/quantum/plugins/ryu/ryu.ini
index 96c3ea460,288d703c1..4c42b9698
--- a/etc/quantum/plugins/ryu/ryu.ini
+++ b/etc/quantum/plugins/ryu/ryu.ini
@@@ -12,10 -12,8 +12,10 @@@ 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]
+ [OVS]
  integration_bridge = br-int
  
  # openflow_rest_api = <host IP address of ofp rest api service>:<port: 8080>