From ff12080d982930b6f83065a36eda23b98c26f51d Mon Sep 17 00:00:00 2001
From: vsaienko <vsaienko@mirantis.com>
Date: Mon, 6 Apr 2015 17:37:54 +0300
Subject: [PATCH] Fix requirements.txt to support netaddr 0.7.14
netaddr >= 0.7.14 is required to support InfiniBand network interfaces,
lift the <= 0.7.13 restriction in the requirements.txt
Related-Bug: #1439079
Change-Id: Ied6f39de0a7bd3150a12a1cec8ca4d36cd1b5931
---
...s.txt.patch => 0002-fix-requirements.patch} | 13 ++++++++-----
rpm/SPECS/openstack-cinder.spec | 5 ++++-
trusty/debian/changelog | 7 +++++++
...uirements.txt-adjust-for-Ubuntu-14.04.patch | 18 ++++++++++--------
4 files changed, 29 insertions(+), 14 deletions(-)
rename rpm/SOURCES/{0002-Adjust-kombu-version-in-requirements.txt.patch => 0002-fix-requirements.patch} (70%)
diff --git a/rpm/SOURCES/0002-Adjust-kombu-version-in-requirements.txt.patch b/rpm/SOURCES/0002-fix-requirements.patch
similarity index 70%
rename from rpm/SOURCES/0002-Adjust-kombu-version-in-requirements.txt.patch
rename to rpm/SOURCES/0002-fix-requirements.patch
index f6e58ee4b..9b04e79f2 100644
--- a/rpm/SOURCES/0002-Adjust-kombu-version-in-requirements.txt.patch
+++ b/rpm/SOURCES/0002-fix-requirements.patch
@@ -1,30 +1,33 @@
From feb3187b939e56a94ae55a6e63f4483420203ca1 Mon Sep 17 00:00:00 2001
From: Maksym Yatsenko <myatsenko@mirantis.com>
-Date: Thu, 19 Mar 2015 18:55:20 +0200
+Date: Mon, 06 Apr 2015 18:55:20 +0200
Subject: [PATCH] Adjust "kombu" version in requirements.txt
Adjust "kombu" version in requirements.txt:
set the lower bound - "kombu>=2.5.0" according to
https://github.com/openstack/requirements/blob/stable/juno/global-requirements.txt#L43
Related-bug:#1434093
+ Remove upper bound for netaddr, because MOS mirrors contains newer version (0.7.14)
---
requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements.txt b/requirements.txt
-index 0e29079..ecbe458 100644
+index 0e29079..90125eb 100644
--- a/requirements.txt
+++ b/requirements.txt
-@@ -10,7 +10,7 @@ eventlet>=0.15.1,<=0.15.2
+@@ -10,9 +10,9 @@ eventlet>=0.15.1,<=0.15.2
greenlet>=0.3.2,<=0.4.2
iso8601>=0.1.9,<=0.1.10
keystonemiddleware>=1.0.0,<1.4.0
-kombu>=3.0.7
+kombu>=2.5.0
lxml>=2.3,<=3.3.3
- netaddr>=0.7.12,<=0.7.13
+-netaddr>=0.7.12,<=0.7.13
++netaddr>=0.7.12
oslo.config>=1.4.0,<=1.6.0 # Apache-2.0
+ oslo.db>=1.0.0,<1.1 # Apache-2.0
+ oslo.messaging>=1.4.0,<1.5.0
--
1.9.1
-
diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec
index f494459cd..906c2c825 100644
--- a/rpm/SPECS/openstack-cinder.spec
+++ b/rpm/SPECS/openstack-cinder.spec
@@ -24,7 +24,7 @@ Source20: cinder-sudoers
# patches_base=2014.1.1
#
Patch0001: 0001-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
-Patch0002: 0002-Adjust-kombu-version-in-requirements.txt.patch
+Patch0002: 0002-fix-requirements.patch
BuildArch: noarch
BuildRequires: intltool
@@ -302,6 +302,9 @@ fi
%endif
%changelog
+* Mon Apr 06 2015 Vasyl Saienko <vsaienko@mirantis.com> 2014.2.2
+- remove upper boud for netaddr because MOS mirrors contains newer version
+
* Fri Mar 06 2015 Daniil Trishkin <dtrishkin@mirantis.com> - 2014.2.2
- Update to upstream 2014.2.2
diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 68a7944fc..07302015b 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+cinder (1:2014.2.2-fuel6.1+14.04+4) trusty; urgency=medium
+
+ * Fixed patch for requirements.txt, removed upper bound for netaddr
+ because MOS mirros contains newer version (netaddr 0.7.14)
+
+ -- Vasyl Saienko <vsaienko@mirantis.com> Mon, 06 Apr 2015 17:34:30 +0200
+
cinder (1:2014.2.2-fuel6.1+14.04+3) trusty; urgency=medium
* fix kombu version in requirements (Related-bug: #1434093)
diff --git a/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch b/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch
index c3e0221ec..b201b3804 100644
--- a/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch
+++ b/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch
@@ -10,16 +10,18 @@ Subject: [PATCH] requirements.txt-adjust-for-Ubuntu-14.04
- "kombu>=2.5.0" according to:
https://github.com/openstack/requirements/blob/stable/juno/global-requirements.txt#L43
Related-bug:#1434093
+* Remove upper bound for netaddr, because MOS mirrors contains newer version
+ (0.7.14)
---
- requirements.txt | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
+ requirements.txt | 7 ++----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/requirements.txt b/requirements.txt
-index 0e29079..ab5ace1 100644
+index 0e29079..1e49918 100644
--- a/requirements.txt
+++ b/requirements.txt
-@@ -4,13 +4,12 @@
+@@ -4,15 +4,14 @@
pbr>=0.6,!=0.7,<1.0
anyjson>=0.3.3,<=0.3.3
@@ -32,8 +34,11 @@ index 0e29079..ab5ace1 100644
-kombu>=3.0.7
+kombu>=2.5.0
lxml>=2.3,<=3.3.3
- netaddr>=0.7.12,<=0.7.13
+-netaddr>=0.7.12,<=0.7.13
++netaddr>=0.7.12
oslo.config>=1.4.0,<=1.6.0 # Apache-2.0
+ oslo.db>=1.0.0,<1.1 # Apache-2.0
+ oslo.messaging>=1.4.0,<1.5.0
@@ -27,7 +26,7 @@ python-glanceclient>=0.14.0,<=0.15.0
python-novaclient>=2.18.0,<=2.20.0
python-swiftclient>=2.2.0,<=2.3.1
@@ -49,6 +54,3 @@ index 0e29079..ab5ace1 100644
WebOb>=1.2.3,<=1.3.1
-wsgiref>=0.1.2
oslo.i18n>=1.0.0,<=1.3.1 # Apache-2.0
---
-1.9.1
-
--
2.45.2