Fix requirements.txt to support netaddr 0.7.14

 MOS mirrors contain newer version of netaddr than specified
 in requirements.txt (0.7.14). So update for requirements.txt
 patch is required to support it LP #1439079

Change-Id: Id3f817a9253a314b219e53b64b78d9afe67219eb

diff --git a/rpm/SOURCES/0001-Adjust-kombu-version-in-requirements.txt.patch b/rpm/SOURCES/0001-fix-requirements.patch
similarity index 50%
rename from rpm/SOURCES/0001-Adjust-kombu-version-in-requirements.txt.patch
rename to rpm/SOURCES/0001-fix-requirements.patch
index 35f5b84b9c5ed3a1e8dd5e65dc9b14ca684f2a8b..0be578bef10f7d6b0e9d777d4d5579901c655ca7 100644 (file)
--- a/rpm/SOURCES/0001-Adjust-kombu-version-in-requirements.txt.patch
+++ b/rpm/SOURCES/0001-fix-requirements.patch
@@ -8,15 +8,23 @@ Subject: [PATCH] Adjust-kombu-version-in-requirements.txt
  https://github.com/openstack/requirements/blob/stable/juno/global-requirements.txt#L43
  Related-bug:#1434093
 
+From dd8a3badd820cc8ec2986d8cf8b77bd5aff30a7a Mon Sep 17 00:00:00 2001
+From: iberezovskiy <iberezovskiy@mirantis.com>
+Date: Mon, 6 Apr 2015 17:30:58 +0300
+Subject: [PATCH] Fix requirements.txt to support netaddr 0.7.14
+
+ MOS mirrors contain newer version of netaddr than specified
+ in requirements.txt (0.7.14). So update for requirements.txt
+ patch is required to support it LP #1439079
 ---
- requirements.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ requirements.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/requirements.txt b/requirements.txt
-index de06b96..933f3fd 100644
+index de06b96..ec8c603 100644
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -16,7 +16,7 @@ django-pyscss>=1.0.3,<=1.0.6 # BSD License (2 clause)
+@@ -16,11 +16,11 @@ django-pyscss>=1.0.3,<=1.0.6 # BSD License (2 clause)
  eventlet>=0.15.1,<=0.15.2
  httplib2>=0.7.5,<=0.9
  iso8601>=0.1.9,<=0.1.10
@@ -25,6 +33,10 @@ index de06b96..933f3fd 100644
  # Horizon Utility Requirements
  # for SECURE_KEY generation
  lockfile>=0.8,<=0.8
+-netaddr>=0.7.12,<=0.7.13
++netaddr>=0.7.12
+ pyScss>=1.2.1,<1.3  # MIT License
+ python-ceilometerclient>=1.0.6,<=1.0.12
+ python-cinderclient>=1.1.0,<=1.1.1
 -- 
 1.9.1
-

diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec
index 0c2175f9bbea3bd1684f977583216030d8faf063..4c0874586bb2cdda89195aa4797d566d387d594c 100644 (file)
--- a/rpm/SPECS/python-django-horizon.spec
+++ b/rpm/SPECS/python-django-horizon.spec
@@ -18,7 +18,7 @@ Source4:    openstack-dashboard-httpd-logging.conf
 #
 # patches_base=2014.2.b2
 #
-Patch0001:  0001-Adjust-kombu-version-in-requirements.txt.patch
+Patch0001:  0001-fix-requirements.patch
 
 #
 # BuildArch needs to be located below patches in the spec file. Don't ask!
@@ -416,6 +416,9 @@ mkdir -p %{buildroot}%{_var}/log/horizon
 #%{_datadir}/openstack-dashboard/openstack_dashboard/enabled/_99_customization.*
 
 %changelog
+* Mon Apr 06 2015 Ivan Berezovskiy <iberezovskiy@mirantis.com> 2014.2.2
+- Fix netaddr in requirements.txt (LP #1439079)
+
 * Mon Mar 02 2015 Mikhail Ivanov <mivanov@mirantis.com> 2014.2.2
 - Update requirements
 

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 97fe8d88cda65b2a4957f6019e387a960a307dfd..517facd2ddecd1d87ee1b8a3231a5cf174dd24e3 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+horizon (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)
+
+ -- Ivan Berezovskiy <iberezovskiy@mirantis.com>  Mon, 06 Apr 2015 17:37:10 +0300
+
 horizon (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/adjust-kombu-version-in-requirements.txt.patch b/trusty/debian/patches/adjust-kombu-version-in-requirements.txt.patch
deleted file mode 100644 (file)
index 35f5b84..0000000
--- a/trusty/debian/patches/adjust-kombu-version-in-requirements.txt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 67985017f58d9e4e68b2555aa38afc4b46008b6a Mon Sep 17 00:00:00 2001
-From: Maksym Yatsenko <myatsenko@mirantis.com>
-Date: Thu, 19 Mar 2015 19:51:47 +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
-
----
- requirements.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/requirements.txt b/requirements.txt
-index de06b96..933f3fd 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -16,7 +16,7 @@ django-pyscss>=1.0.3,<=1.0.6 # BSD License (2 clause)
- eventlet>=0.15.1,<=0.15.2
- httplib2>=0.7.5,<=0.9
- iso8601>=0.1.9,<=0.1.10
--kombu>=2.5.0,<=3.0.7
-+kombu>=2.5.0
- # Horizon Utility Requirements
- # for SECURE_KEY generation
- lockfile>=0.8,<=0.8
--- 
-1.9.1
-

diff --git a/trusty/debian/patches/fix-requirements.patch b/trusty/debian/patches/fix-requirements.patch
new file mode 100644 (file)
index 0000000..5a4f1e8
--- /dev/null
+++ b/trusty/debian/patches/fix-requirements.patch
@@ -0,0 +1,42 @@
+From 67985017f58d9e4e68b2555aa38afc4b46008b6a Mon Sep 17 00:00:00 2001
+From: Maksym Yatsenko <myatsenko@mirantis.com>
+Date: Thu, 19 Mar 2015 19:51:47 +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
+
+From dd8a3badd820cc8ec2986d8cf8b77bd5aff30a7a Mon Sep 17 00:00:00 2001
+From: iberezovskiy <iberezovskiy@mirantis.com>
+Date: Mon, 6 Apr 2015 17:30:58 +0300
+Subject: [PATCH] Fix requirements.txt to support netaddr 0.7.14
+
+ MOS mirrors contain newer version of netaddr than specified
+ in requirements.txt (0.7.14). So update for requirements.txt
+ patch is required to support it LP #1439079
+---
+ requirements.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/requirements.txt b/requirements.txt
+index de06b96..ec8c603 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -16,11 +16,11 @@ django-pyscss>=1.0.3,<=1.0.6 # BSD License (2 clause)
+ eventlet>=0.15.1,<=0.15.2
+ httplib2>=0.7.5,<=0.9
+ iso8601>=0.1.9,<=0.1.10
+-kombu>=2.5.0,<=3.0.7
++kombu>=2.5.0
+ # Horizon Utility Requirements
+ # for SECURE_KEY generation
+ lockfile>=0.8,<=0.8
+-netaddr>=0.7.12,<=0.7.13
++netaddr>=0.7.12
+ pyScss>=1.2.1,<1.3  # MIT License
+ python-ceilometerclient>=1.0.6,<=1.0.12
+ python-cinderclient>=1.1.0,<=1.1.1
+--
+1.9.1

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 150b1c84a6ef02ac898b051402cfd93b97a6ab83..1a1392bdb07066abdf37be93a267403a1d29e6fe 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,4 +1,4 @@
 fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 ubuntu_settings.patch
-adjust-kombu-version-in-requirements.txt.patch
\ No newline at end of file
+fix-requirements.patch