Drop deps patches

They were used with non-trivial EPEL packages
that are replaced with straightforward editions.

Change-Id: If3b85c07abda47aa2238283ef7b84e69f4982df2

conf/patches/glance/glance-newdeps.patch

@@ -1,41 +0,0 @@
-Delve into pkg_resources a little to get it to modify sys.path,
-so that our parallel installed egg takes precedence over the
-system default module versions.
-
-diff -up glance-2011.3/glance/__init__.py.newdeps glance-2011.3/glance/__init__.py
---- glance-2011.3/glance/__init__.py.newdeps	2012-01-06 17:22:36.000000000 +0000
-+++ glance-2011.3/glance/__init__.py	2012-01-06 17:25:01.019063547 +0000
-@@ -18,3 +18,31 @@
- import gettext
- 
- gettext.install('glance', unicode=1)
-+
-+import sys
-+import pkg_resources
-+
-+# If there is a conflicting non egg module,
-+# i.e. an older standard system module installed,
-+# then replace it with this requirement
-+def replace_dist(requirement):
-+    try:
-+        return pkg_resources.require(requirement)
-+    except pkg_resources.VersionConflict:
-+        e = sys.exc_info()[1]
-+        dist=e.args[0]
-+        req=e.args[1]
-+        if dist.key == req.key and not dist.location.endswith('.egg'):
-+            del pkg_resources.working_set.by_key[dist.key]
-+            # We assume there is no need to adjust sys.path
-+            # and the associated pkg_resources.working_set.entries
-+            return pkg_resources.require(requirement)
-+
-+replace_dist("SQLALchemy >= 0.6.3")
-+replace_dist("WebOb >= 1.0")
-+replace_dist("Routes >= 1.12.3")
-+
-+replace_dist("PasteDeploy >= 1.5.0")
-+# This hack is needed because replace_dist() results in
-+# the standard paste module path being at the start of __path__.
-+# TODO: See can we get pkg_resources to do the right thing directly
-+import paste
-+paste.__path__.insert(0, paste.__path__.pop(-1))

conf/patches/keystone/keystone-newdeps.patch

@@ -1,51 +0,0 @@
---- keystone-2013.1/bin/keystone-all
-+++ keystone-2013.1/bin/keystone-all
-@@ -19,14 +19,14 @@ if os.path.exists(os.path.join(possible_topdir,
-     sys.path.insert(0, possible_topdir)
- 
- 
--from paste import deploy
--
- from keystone import config
- from keystone.common import wsgi
- from keystone.common import utils
- from keystone.openstack.common import importutils
- from keystone.openstack.common import version
- 
-+from paste import deploy
-+
- 
- CONF = config.CONF
- 
---- keystone-2013.1/keystone/__init__.py
-+++ keystone-2013.1/keystone/__init__.py
-@@ -0,0 +1,29 @@
-+import sys
-+import pkg_resources
-+
-+# If there is a conflicting non egg module,
-+# i.e. an older standard system module installed,
-+# then replace it with this requirement
-+def replace_dist(requirement):
-+    try:
-+        return pkg_resources.require(requirement)
-+    except pkg_resources.VersionConflict:
-+        e = sys.exc_info()[1]
-+        dist=e.args[0]
-+        req=e.args[1]
-+        if dist.key == req.key and not dist.location.endswith('.egg'):
-+            del pkg_resources.working_set.by_key[dist.key]
-+            # We assume there is no need to adjust sys.path
-+            # and the associated pkg_resources.working_set.entries
-+            return pkg_resources.require(requirement)
-+
-+replace_dist("WebOb >= 1.0")
-+replace_dist("SQLAlchemy >= 0.6.3")
-+replace_dist("Routes >= 1.12.3")
-+
-+replace_dist("PasteDeploy >= 1.5.0")
-+# This hack is needed because replace_dist() results in
-+# the standard paste module path being at the start of __path__.
-+# TODO: See can we get pkg_resources to do the right thing directly
-+import paste
-+paste.__path__.insert(0, paste.__path__.pop(-1))

conf/patches/nova/nova-deps.patch

@@ -1,38 +0,0 @@
---- nova-2013.1/nova/__init__.py
-+++ nova-2013.1/nova/__init__.py
-@@ -24,6 +24,36 @@
-    :platform: Unix
-    :synopsis: Infrastructure-as-a-Service Cloud platform.
- """
-+import sys
-+import pkg_resources
-+
-+# If there is a conflicting non egg module,
-+# i.e. an older standard system module installed,
-+# then replace it with this requirement
-+def replace_dist(requirement):
-+    try:
-+        return pkg_resources.require(requirement)
-+    except pkg_resources.VersionConflict:
-+        e = sys.exc_info()[1]
-+        dist=e.args[0]
-+        req=e.args[1]
-+        if dist.key == req.key and not dist.location.endswith('.egg'):
-+            del pkg_resources.working_set.by_key[dist.key]
-+            # We assume there is no need to adjust sys.path
-+            # and the associated pkg_resources.working_set.entries
-+            return pkg_resources.require(requirement)
-+
-+replace_dist("WebOb >= 1.0")
-+replace_dist("SQLAlchemy >= 0.6.3")
-+replace_dist("Routes >= 1.12.3")
-+
-+replace_dist("PasteDeploy >= 1.5.0")
-+# This hack is needed because replace_dist() results in
-+# the standard paste module path being at the start of __path__.
-+# TODO: See can we get pkg_resources to do the right thing directly
-+import paste
-+paste.__path__.insert(0, paste.__path__.pop(-1))
-+
- 
- import gettext

conf/patches/quantum/quantum-newdeps.patch

@@ -1,39 +0,0 @@
-diff -Naur quantum-2012.1.orig/quantum/__init__.py quantum-2012.1/quantum/__init__.py
---- quantum-2012.1.orig/quantum/__init__.py	2012-04-25 12:30:18.110482493 +0000
-+++ quantum-2012.1/quantum/__init__.py	2012-04-25 12:31:34.397515453 +0000
-@@ -15,5 +15,35 @@
- #    License for the specific language governing permissions and limitations
- #    under the License.
- 
-+import sys
-+import pkg_resources
-+
-+# If there is a conflicting non egg module,
-+# i.e. an older standard system module installed,
-+# then replace it with this requirement
-+def replace_dist(requirement):
-+    try:
-+        return pkg_resources.require(requirement)
-+    except pkg_resources.VersionConflict:
-+        e = sys.exc_info()[1]
-+        dist=e.args[0]
-+        req=e.args[1]
-+        if dist.key == req.key and not dist.location.endswith('.egg'):
-+            del pkg_resources.working_set.by_key[dist.key]
-+            # We assume there is no need to adjust sys.path
-+            # and the associated pkg_resources.working_set.entries
-+            return pkg_resources.require(requirement)
-+
-+replace_dist("WebOb >= 1.0")
-+replace_dist("SQLAlchemy >= 0.6.3")
-+replace_dist("Routes >= 1.12.3")
-+
-+replace_dist("PasteDeploy >= 1.5.0")
-+# This hack is needed because replace_dist() results in
-+# the standard paste module path being at the start of __path__.
-+# TODO: See can we get pkg_resources to do the right thing directly
-+import paste
-+paste.__path__.insert(0, paste.__path__.pop(-1))
-+
- from pkgutil import extend_path
- __path__ = extend_path(__path__, __name__)