Update Neutron Trusty packages

- requirements patch for Neutron should be updated according to the latest
Neutron 2014.2.2 code
- update dependencies according to global-requirements [1]

[1] https://github.com/openstack/requirements/blob/stable/juno/global-requirements.txt#L126

Change-Id: If934bfb121c6b0b8276143470f98ef296dc7ce0b

diff --git a/trusty/debian/control b/trusty/debian/control
index 07dc0ae6e4ec6a6c63c31915820412b2ebe3c581..23040f5124c09ae36efbb82190444c6d82d4bab4 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -440,7 +440,7 @@ Depends:
  python-oslo.rootwrap (>= 1.3.0),
  python-paste,
  python-pastedeploy,
- python-requests (>= 1.2.1),
+ python-requests (>= 2.1.0),
  python-routes (>= 1.12.3),
  python-six (>= 1.7.0),
  python-sqlalchemy (>= 0.9.7),

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 23e211fa8da8f2945cf7a2f31680914a691a7286..c311d324fd2d25ce841ceffdc9b9c88df24b22d6 100644 (file)
--- 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
@@ -1,6 +1,6 @@
-From 995801873f795b873fe396984d380bc00ce5110b Mon Sep 17 00:00:00 2001
+From 17d6fcd1fd93931e981d7261abe316b84a8237b2 Mon Sep 17 00:00:00 2001
 From: Sergey Kolekonov <skolekonov@mirantis.com>
-Date: Wed, 25 Feb 2015 22:32:35 +0300
+Date: Wed, 11 Mar 2015 13:28:59 +0300
 Subject: [PATCH] requirements.txt: adjust for Ubuntu 14.04
 
 * Routes!=2.0 restriction is necessary only for running tests with python 3.x,
@@ -11,20 +11,20 @@ Subject: [PATCH] requirements.txt: adjust for Ubuntu 14.04
  1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/requirements.txt b/requirements.txt
-index c330c6d..796531e 100644
+index d597cdc..8e8dfa6 100644
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -5,9 +5,8 @@ pbr>=0.6,!=0.7,<1.0
  
- Paste
- PasteDeploy>=1.5.0
--Routes>=1.12.3,!=2.0
-+Routes>=1.12.3
- anyjson>=0.3.3
+ Paste<=1.7.5.1
+ PasteDeploy>=1.5.0,<=1.5.2
+-Routes>=1.12.3,!=2.0,<=2.1
++Routes>=1.12.3,<=2.1
+ anyjson>=0.3.3,<=0.3.3
 -argparse
- Babel>=1.3
- eventlet>=0.15.1,<0.16.0
- greenlet>=0.3.2
+ Babel>=1.3,<=1.3
+ eventlet>=0.15.1,<=0.15.2
+ greenlet>=0.3.2,<=0.4.2
 -- 
 1.9.1