--- a/components/openstack/glance/patches/04-requirements.patch	Tue Apr 07 15:49:29 2015 -0700
+++ b/components/openstack/glance/patches/04-requirements.patch	Tue Apr 07 13:31:20 2015 -0700
@@ -1,71 +1,93 @@
 In-house patch to remove unnecessary dependencies from Glance's
 requirements files. The specific reasons are as follows:
 
-lxml		No longer applicable
-		(upstream commit b7f9120cd4623d8284c4edfea760ef10e1193492)
+boto		Not applicable
+
+cinderclient	Not applicable
 
-passlib		No longer applicable
-		(upstream commit b31874284212d49560ddf4f36e5c9ca5d221f605)
+greenlet	Not applicable
+
+kombu		Not applicable
+
+oslo.vmware	Not applicable
 
 pycrypto	Not applicable to Solaris (M2Crypto used instead)
 
-wsgiref		No longer applicable
-		(upstream commit b31874284212d49560ddf4f36e5c9ca5d221f605)
+swiftclient	Not applicable
 
---- glance-2013.2.3/glance.egg-info/requires.txt.orig	2014-04-03 11:46:54.000000000 -0700
-+++ glance-2013.2.3/glance.egg-info/requires.txt	2014-05-24 23:04:42.210143004 -0700
-@@ -6,20 +6,16 @@
- PasteDeploy>=1.5.0
- Routes>=1.12.3
- WebOb>=1.2.3,<1.3
--wsgiref>=0.1.2
- boto>=2.4.0,!=2.13.0
- sqlalchemy-migrate>=0.7.2
- httplib2
- kombu>=2.4.8
+--- glance-2014.2.2/glance.egg-info/requires.txt.~1~	2015-02-05 07:21:46.000000000 -0800
++++ glance-2014.2.2/glance.egg-info/requires.txt	2015-02-23 14:39:12.013101917 -0800
+@@ -1,5 +1,4 @@
+ pbr>=0.6,!=0.7,<1.0
+-greenlet>=0.3.2
+ SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
+ anyjson>=0.3.3
+ eventlet>=0.15.1,<0.16.0
+@@ -7,11 +6,8 @@ PasteDeploy>=1.5.0
+ Routes>=1.12.3,!=2.0
+ WebOb>=1.2.3
+ argparse
+-boto>=2.32.1,<2.35.0
+ sqlalchemy-migrate==0.9.1
+ httplib2>=0.7.5
+-kombu>=2.5.0
 -pycrypto>=2.6
- iso8601>=0.1.8
- oslo.config>=1.2.0
- python-swiftclient>=1.5,<2.0.0
--lxml>=2.3
+ iso8601>=0.1.9
+ ordereddict
+ oslo.config>=1.4.0  # Apache-2.0
+@@ -20,11 +16,8 @@ netaddr>=0.7.12
+ keystonemiddleware>=1.0.0
+ WSME>=0.6
+ posix_ipc
+-python-swiftclient>=2.2.0
+-oslo.vmware>=0.6.0,<0.9.0               # Apache-2.0
  Paste
--passlib
- jsonschema>=1.3.0,!=1.4.0
- python-cinderclient>=1.0.6
- python-keystoneclient>=0.3.2
+ jsonschema>=2.0.0,<3.0.0
+-python-cinderclient>=1.1.0
+ python-keystoneclient>=0.10.0
  pyOpenSSL>=0.11
--six>=1.4.1
-\ No newline at end of file
-+six>=1.4.1
---- glance-2013.2.3/requirements.txt.orig	2014-04-03 11:43:55.000000000 -0700
-+++ glance-2013.2.3/requirements.txt	2014-05-24 23:05:14.053235541 -0700
-@@ -12,29 +12,20 @@
- PasteDeploy>=1.5.0
- Routes>=1.12.3
- WebOb>=1.2.3,<1.3
--wsgiref>=0.1.2
+ six>=1.7.0
+--- glance-2014.2.2/requirements.txt.~1~	2015-02-05 07:19:44.000000000 -0800
++++ glance-2014.2.2/requirements.txt	2015-02-23 14:39:03.037319077 -0800
+@@ -3,11 +3,6 @@
+ # process, which may cause wedges in the gate later.
+ 
+ pbr>=0.6,!=0.7,<1.0
+-#
+-# The greenlet package must be compiled with gcc and needs
+-# the Python.h headers. Make sure you install the python-dev
+-# package to get the right headers...
+-greenlet>=0.3.2
+ 
+ # < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
+ SQLAlchemy>=0.8.4,<=0.9.99,!=0.9.0,!=0.9.1,!=0.9.2,!=0.9.3,!=0.9.4,!=0.9.5,!=0.9.6
+@@ -17,11 +12,8 @@ PasteDeploy>=1.5.0
+ Routes>=1.12.3,!=2.0
+ WebOb>=1.2.3
  argparse
- boto>=2.4.0,!=2.13.0
- sqlalchemy-migrate>=0.7.2
- httplib2
- kombu>=2.4.8
+-boto>=2.32.1,<2.35.0
+ sqlalchemy-migrate==0.9.1
+ httplib2>=0.7.5
+-kombu>=2.5.0
 -pycrypto>=2.6
- iso8601>=0.1.8
- oslo.config>=1.2.0
+ iso8601>=0.1.9
+ ordereddict
+ oslo.config>=1.4.0  # Apache-2.0
+@@ -32,17 +24,10 @@ WSME>=0.6
+ # For openstack/common/lockutils
+ posix_ipc
  
- # For Swift storage backend.
- python-swiftclient>=1.5,<2.0.0
- 
--# Note you will need gcc buildtools installed and must
--# have installed libxml headers for lxml to be successfully
--# installed using pip, therefore you will need to install the
--# libxml2-dev and libxslt-dev Ubuntu packages.
--lxml>=2.3
+-# For Swift storage backend.
+-python-swiftclient>=2.2.0
+-
+-# For VMware storage backed.
+-oslo.vmware>=0.6.0,<0.9.0               # Apache-2.0
 -
  # For paste.util.template used in keystone.common.template
  Paste
  
--passlib
- jsonschema>=1.3.0,!=1.4.0
- python-cinderclient>=1.0.6
- python-keystoneclient>=0.3.2
+ jsonschema>=2.0.0,<3.0.0
+-python-cinderclient>=1.1.0
+ python-keystoneclient>=0.10.0
+ pyOpenSSL>=0.11
+