From: Nachi Ueno <nachi@nttmcl.com>
Date: Thu, 26 Jul 2012 22:54:18 +0000 (+0000)
Subject: ovs_quantum_plugin should use reconnect_interval in common conf.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=787f763a33cf59a58930e4b6ee329a43d2dbedd0;p=openstack-build%2Fneutron-build.git

ovs_quantum_plugin should use reconnect_interval in common conf.

Fixes Bug : 1029680

Change-Id: I5dd2467bc5e287bbb5ff4a2527b9f701375fa376
---

diff --git a/quantum/plugins/openvswitch/ovs_quantum_plugin.py b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
index 4cc754b15..d04daf84a 100644
--- a/quantum/plugins/openvswitch/ovs_quantum_plugin.py
+++ b/quantum/plugins/openvswitch/ovs_quantum_plugin.py
@@ -270,7 +270,7 @@ class OVSQuantumPluginV2(db_base_plugin_v2.QuantumDbPluginV2):
         options.update({'base': models_v2.model_base.BASEV2})
         sql_max_retries = cfg.CONF.DATABASE.sql_max_retries
         options.update({"sql_max_retries": sql_max_retries})
-        reconnect_interval = conf.DATABASE.reconnect_interval
+        reconnect_interval = cfg.CONF.DATABASE.reconnect_interval
         options.update({"reconnect_interval": reconnect_interval})
         db.configure_db(options)