components/openstack/neutron/patches/04-requirements.patch
branchs11-update
changeset 4072 db0cec748ec0
parent 3178 77584387a894
child 5405 66fd59fecd68
--- a/components/openstack/neutron/patches/04-requirements.patch	Tue Apr 07 15:49:29 2015 -0700
+++ b/components/openstack/neutron/patches/04-requirements.patch	Tue Apr 07 13:31:20 2015 -0700
@@ -1,48 +1,40 @@
 In-house patch to remove unnecessary dependencies from Neutron's
 requirements files. The specific reasons are as follows:
 
-amqplib		No longer applicable
-		(upstream commit 39ffcb0dd75d9dc5d8a249f2974a67f0def5204b)
+oslo.rootwrap	Not applicable to Solaris
 
-argparse	Not applicable to Solaris (Brocade specific)
-
-novaclient	No longer applicable
-
-pyudev		Not applicable to Solaris (Linux bridging specific)
+paste		Not applicable
 
---- neutron-2013.2.3/neutron.egg-info/requires.txt.orig	2014-04-03 11:49:53.000000000 -0700
-+++ neutron-2013.2.3/neutron.egg-info/requires.txt	2014-05-24 23:12:26.486505631 -0700
-@@ -1,9 +1,7 @@
--pyudev
- pbr>=0.5.21,<1.0
- Paste
+--- neutron-2014.2.2/neutron.egg-info/requires.txt.~1~	2015-02-05 07:46:25.000000000 -0800
++++ neutron-2014.2.2/neutron.egg-info/requires.txt	2015-02-25 00:20:01.378154156 -0800
+@@ -1,5 +1,4 @@
+ pbr>=0.6,!=0.7,<1.0
+-Paste
  PasteDeploy>=1.5.0
- Routes>=1.12.3
--amqplib>=0.6.1
+ Routes>=1.12.3,!=2.0
  anyjson>=0.3.3
- Babel>=1.3
- eventlet>=0.13.0
-@@ -23,4 +21,3 @@
- six>=1.4.1
- stevedore>=0.10
- oslo.config>=1.2.0
--python-novaclient>=2.15.0
+@@ -24,5 +23,4 @@ stevedore>=1.0.0  # Apache-2.0
+ oslo.config>=1.4.0  # Apache-2.0
+ oslo.db>=1.0.0,<1.1  # Apache-2.0
+ oslo.messaging>=1.4.0,!=1.5.0,<1.6.0
+-oslo.rootwrap>=1.3.0
+-python-novaclient>=2.18.0
++python-novaclient>=2.18.0
 \ No newline at end of file
-
---- neutron-2013.2.3/requirements.txt.orig	2014-04-03 11:49:01.000000000 -0700
-+++ neutron-2013.2.3/requirements.txt	2014-05-24 23:12:57.116696613 -0700
-@@ -3,9 +3,7 @@
- Paste
+--- neutron-2014.2.2/requirements.txt.~1~	2015-02-05 07:45:33.000000000 -0800
++++ neutron-2014.2.2/requirements.txt	2015-02-25 00:19:55.500774949 -0800
+@@ -3,7 +3,6 @@
+ # process, which may cause wedges in the gate later.
+ pbr>=0.6,!=0.7,<1.0
+ 
+-Paste
  PasteDeploy>=1.5.0
- Routes>=1.12.3
--amqplib>=0.6.1
+ Routes>=1.12.3,!=2.0
  anyjson>=0.3.3
--argparse
- Babel>=1.3
- eventlet>=0.13.0
- greenlet>=0.3.2
-@@ -25,4 +23,3 @@
- stevedore>=0.10
- oslo.config>=1.2.0
+@@ -28,6 +27,5 @@ stevedore>=1.0.0  # Apache-2.0
+ oslo.config>=1.4.0  # Apache-2.0
+ oslo.db>=1.0.0,<1.1  # Apache-2.0
+ oslo.messaging>=1.4.0,!=1.5.0,<1.6.0
+-oslo.rootwrap>=1.3.0
  
--python-novaclient>=2.15.0
+ python-novaclient>=2.18.0