Merge "Revert dependency on oslo.config 1.2.0"

diff --cc etc/quantum/plugins/nec/nec.ini
index a2e9900def757b570f66e16cf9b69efa4d1d4002,21737c50585e87cd74a5714d38574be3eef169f2..22da0b03ff378b44ac3b6c9546afae86b88df4e1
--- 1/etc/quantum/plugins/nec/nec.ini
--- 2/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 ada8072483d6ce7edfb18e71c6e9ee53b0488b9f,e46dc195e8bef1d09f05479864f63fab2904624e..c784f7bdf416281814e59596f7bdd7042c2262fe
--- 1/etc/quantum/plugins/nicira/nvp.ini
--- 2/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 22d829ad1983aa15e341fde9e3d4122ece00642a,d0e1527b848a7584f3db959e9db0bba8d95a2cd9..cc1d2d9cedbf63a6a8f83e78517b3bb65c58903c
--- 1/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini
--- 2/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 96c3ea460b9c42f8b18974a018bf18bd9c23b929,288d703c11575cd4fba4b11b2c7af987fc6ce5b3..4c42b9698291eccf99e598240ecd9b9c198baf8b
--- 1/etc/quantum/plugins/ryu/ryu.ini
--- 2/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>