Fix requirements.txt to support netaddr 0.7.14

netaddr >= 0.7.14 is required to support InfiniBand interfaces,
therefore lift netaddr <= 0.7.13 restriction in the requirements.txt

Related-Bug: #1439079

Change-Id: Ifbcdac4ec2feb2087302ab2cec13eb7901f8a38d

diff --git a/.gitreview b/.gitreview
index bbaba7c1b9398df689e5b8b6f89b0b6c0c71db39..5dae80b1f38488ae4c38885dd6d8936a01f6a15b 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
-host=gerrit.mirantis.com
+host=review.fuel-infra.org
 port=29418
-project=openstack-ci/openstack/heat-build
+project=openstack-build/heat-build
 defaultbranch=master

diff --git a/rpm/SOURCES/0003-Adjust-kombu-version-in-requirements.txt.patch b/rpm/SOURCES/0003-Adjust-kombu-version-in-requirements.txt.patch
deleted file mode 100644 (file)
index 71c1ae7..0000000
--- a/rpm/SOURCES/0003-Adjust-kombu-version-in-requirements.txt.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Author: iberezovskiy <iberezovskiy@mirantis.com>
-Date:   Fri Mar 20 14:57:00 2015 +0300
-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
-
----
- requirements.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/requirements.txt b/requirements.txt
-index 16e102b..def5c6d 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -10,7 +10,7 @@ greenlet>=0.3.2,<=0.4.2
- httplib2>=0.7.5,<=0.9
- iso8601>=0.1.9,<=0.1.10
- keystonemiddleware>=1.0.0,<1.4.0
--kombu>=2.5.0,<=3.0.7
-+kombu>=2.5.0
- lxml>=2.3,<=3.3.3
- netaddr>=0.7.12,<=0.7.13
- oslo.config>=1.4.0,<=1.6.0 # Apache-2.0

diff --git a/rpm/SOURCES/0003-fix-requirements.patch b/rpm/SOURCES/0003-fix-requirements.patch
new file mode 100644 (file)
index 0000000..fa2cb34
--- /dev/null
+++ b/rpm/SOURCES/0003-fix-requirements.patch
@@ -0,0 +1,16 @@
+diff --git a/requirements.txt b/requirements.txt
+index 16e102b..d2a261c 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -10,9 +10,9 @@ greenlet>=0.3.2,<=0.4.2
+ httplib2>=0.7.5,<=0.9
+ iso8601>=0.1.9,<=0.1.10
+ keystonemiddleware>=1.0.0,<1.4.0
+-kombu>=2.5.0,<=3.0.7
++kombu>=2.5.0
+ lxml>=2.3,<=3.3.3
+-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.i18n>=1.0.0,<=1.3.1 # Apache-2.0

diff --git a/rpm/SPECS/openstack-heat.spec b/rpm/SPECS/openstack-heat.spec
index 8f040434bbc8fe51524022fda106c021da65a812..85b311a7ebf0ca29cf8ea68aea0daae939dec2bc 100644 (file)
--- a/rpm/SPECS/openstack-heat.spec
+++ b/rpm/SPECS/openstack-heat.spec
@@ -28,7 +28,7 @@ Source5:      openstack-heat-api-cloudwatch.init
 
 Patch0001: 0001-remove-pbr-runtime-dependency.patch
 Patch0002: 0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
-Patch0003: 0003-Adjust-kombu-version-in-requirements.txt.patch
+Patch0003: 0003-fix-requirements.patch
 
 BuildArch: noarch
 BuildRequires: git
@@ -426,6 +426,9 @@ fi
 
 
 %changelog
+* Mon Apr 06 2015 Vasyl Saienko <vsaienko@mirantis.com> 2014.2.2
+- Fixed patch for requirements.txt, removed upper bound for netaddr
+
 * Fri Mar 20 2015 Ivan Berezovskiy <iberezovskiy@mirantis.com> - 2014.2.2
 - Add patch to fix kombu version in requirements.txt (Related-bug: #1434093)
 

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index e9d815e8581094d6026ad0a24b5d5a7c177254e1..68220469c75c38a463e5a62c207a1c4492b3d800 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+heat (2014.2.2-fuel6.1+14.04+3) 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
+
 heat (2014.2.2-fuel6.1+14.04+2) trusty; urgency=medium
 
   * Update requirements

diff --git a/trusty/debian/patches/requirements-built-in.patch b/trusty/debian/patches/requirements-built-in.patch
index d4456aa5b6df37454077887756cabe62dcfbf43f..fd177d34c645dfc26ecea4cd9a6aa4e935aa8ac9 100644 (file)
--- a/trusty/debian/patches/requirements-built-in.patch
+++ b/trusty/debian/patches/requirements-built-in.patch
@@ -1,8 +1,8 @@
 diff --git a/requirements.txt b/requirements.txt
-index 16e102b..3ecb714 100644
+index 16e102b..b49b5e8 100644
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -3,14 +3,13 @@
+@@ -3,16 +3,15 @@
  # process, which may cause wedges in the gate later.
  
  pbr>=0.6,!=0.7,<1.0
@@ -16,8 +16,11 @@ index 16e102b..3ecb714 100644
 -kombu>=2.5.0,<=3.0.7
 +kombu>=2.5.0,<=3.0.16
  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.i18n>=1.0.0,<=1.3.1 # Apache-2.0
 @@ -34,7 +33,7 @@ python-troveclient>=1.0.4,<=1.0.8
  PyYAML>=3.1.0,<=3.10
  qpid-python<=0.26.1