From 0e5eab876a22df5188af02374dd5efcab59600e2 Mon Sep 17 00:00:00 2001 From: Ilya Shakhat Date: Mon, 12 Jan 2015 18:24:20 +0300 Subject: [PATCH] Revert "Applied patch for openstack-neutron-mellanox" This reverts commit a29940782f6e8221374f3b3f12c5b334ac8868f7. The original patch already present in stable/juno and will be merged during the sync. Change-Id: I5e9cb8968e6286a0b2174583bf54440d2db15999 Partial-Closes-Bug: #1409766 --- .../MLNX-openstack-neutron-mellanox.patch | 18 ------------------ debian/patches/series | 1 - .../MLNX-openstack-neutron-mellanox.patch | 18 ------------------ rpm/SPECS/openstack-neutron.spec | 2 -- 4 files changed, 39 deletions(-) delete mode 100644 debian/patches/MLNX-openstack-neutron-mellanox.patch delete mode 100644 rpm/SOURCES/MLNX-openstack-neutron-mellanox.patch diff --git a/debian/patches/MLNX-openstack-neutron-mellanox.patch b/debian/patches/MLNX-openstack-neutron-mellanox.patch deleted file mode 100644 index 584beabb3..000000000 --- a/debian/patches/MLNX-openstack-neutron-mellanox.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 c10a6cf53..767b46cbe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 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 deleted file mode 100644 index 584beabb3..000000000 --- a/rpm/SOURCES/MLNX-openstack-neutron-mellanox.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 cd8f6f8d4..aa273fbc9 100644 --- a/rpm/SPECS/openstack-neutron.spec +++ b/rpm/SPECS/openstack-neutron.spec @@ -48,7 +48,6 @@ 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 @@ -481,7 +480,6 @@ IPSec. %setup -q -n neutron-%{version} %patch0001 -p1 -%patch0002 -p1 find neutron -name \*.py -exec sed -i '/\/usr\/bin\/env python/{d;q}' {} + -- 2.45.2