commit d8baf23634fb6654b71f79314a8d60dbd58cece4
author Jenkins <jenkins@review.openstack.org> Wed Aug 06 13:47:46 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Aug 06 13:47:46 2014 +0000
tree d197360820438e682552ad36d5104b2d71295793
parent 8f847ef53b4d6a87a77235c7eec34d3f5d795b75
parent 2988497b5d136f3646459d2fcc7e226e08d4bfb7

Merge "NSX: remove req_timeout as it's not longer used"

lib/neutron_plugins/vmware_nsx

diff --git a/lib/neutron_plugins/vmware_nsx b/lib/neutron_plugins/vmware_nsx
index 5802ebf..f4eb82d 100644
--- a/lib/neutron_plugins/vmware_nsx
+++ b/lib/neutron_plugins/vmware_nsx
@@ -105,9 +105,6 @@
     if [[ "$NSX_PASSWORD" != "" ]]; then
         iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_password $NSX_PASSWORD
     fi
-    if [[ "$NSX_REQ_TIMEOUT" != "" ]]; then
-        iniset /$Q_PLUGIN_CONF_FILE DEFAULT req_timeout $NSX_REQ_TIMEOUT
-    fi
     if [[ "$NSX_HTTP_TIMEOUT" != "" ]]; then
         iniset /$Q_PLUGIN_CONF_FILE DEFAULT http_timeout $NSX_HTTP_TIMEOUT
     fi