Applied patch for openstack-neutron-mellanox

Change-Id: I71754a549c58196a3b1db383afa7804cdd6d644e
Partial-Closes-Bug: #1386865

diff --git a/debian/patches/MLNX-openstack-neutron-mellanox.patch b/debian/patches/MLNX-openstack-neutron-mellanox.patch
new file mode 100644 (file)
index 0000000..584beab
--- /dev/null
+++ b/debian/patches/MLNX-openstack-neutron-mellanox.patch
@@ -0,0 +1,18 @@
+--- a/neutron/plugins/mlnx/common/comm_utils.py        2014-10-30 09:10:04.378788721 +0000
++++ b/neutron/plugins/mlnx/common/comm_utils.py        2014-10-30 09:10:27.689850641 +0000
+@@ -35,7 +35,6 @@
+     :param retries: number of times to try before giving up
+     :raises: exceptionToCheck
+     """
+-    sleep_fn = time.sleep
+ 
+     def __init__(self, exceptionToCheck,
+                  interval=cfg.CONF.ESWITCH.request_timeout / 1000,
+@@ -56,7 +55,7 @@
+                 except self.exc:
+                     LOG.debug(_("Request timeout - call again after "
+                               "%s seconds"), sleep_interval)
+-                    RetryDecorator.sleep_fn(sleep_interval)
++                    time.sleep(sleep_interval)
+                     num_of_iter -= 1
+                     sleep_interval *= self.backoff_rate

diff --git a/debian/patches/series b/debian/patches/series
index 767b46cbe970c4a234e3985fe1eff8b1b55f6ef5..c10a6cf53101d62ca8a700b650f239821af5c16e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-neutron-configuration.patch
 disable-udev-tests.patch
+MLNX-openstack-neutron-mellanox.patch

diff --git a/rpm/SOURCES/MLNX-openstack-neutron-mellanox.patch b/rpm/SOURCES/MLNX-openstack-neutron-mellanox.patch
new file mode 100644 (file)
index 0000000..584beab
--- /dev/null
+++ b/rpm/SOURCES/MLNX-openstack-neutron-mellanox.patch
@@ -0,0 +1,18 @@
+--- a/neutron/plugins/mlnx/common/comm_utils.py        2014-10-30 09:10:04.378788721 +0000
++++ b/neutron/plugins/mlnx/common/comm_utils.py        2014-10-30 09:10:27.689850641 +0000
+@@ -35,7 +35,6 @@
+     :param retries: number of times to try before giving up
+     :raises: exceptionToCheck
+     """
+-    sleep_fn = time.sleep
+ 
+     def __init__(self, exceptionToCheck,
+                  interval=cfg.CONF.ESWITCH.request_timeout / 1000,
+@@ -56,7 +55,7 @@
+                 except self.exc:
+                     LOG.debug(_("Request timeout - call again after "
+                               "%s seconds"), sleep_interval)
+-                    RetryDecorator.sleep_fn(sleep_interval)
++                    time.sleep(sleep_interval)
+                     num_of_iter -= 1
+                     sleep_interval *= self.backoff_rate

diff --git a/rpm/SPECS/openstack-neutron.spec b/rpm/SPECS/openstack-neutron.spec
index aa273fbc9f522aad7c015064a77beb66a3c2c6fc..cd8f6f8d44bf951ba3f76644ded85f69f2f22291 100644 (file)
--- a/rpm/SPECS/openstack-neutron.spec
+++ b/rpm/SPECS/openstack-neutron.spec
@@ -48,6 +48,7 @@ Source90:     neutron-dist.conf
 # patches_base=2014.1.1+1
 #
 Patch0001: 0001-remove-runtime-dependency-on-pbr.patch
+Patch0002: MLNX-openstack-neutron-mellanox.patch
 
 BuildArch:     noarch
 
@@ -480,6 +481,7 @@ IPSec.
 %setup -q -n neutron-%{version}
 
 %patch0001 -p1
+%patch0002 -p1
 
 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} +