x/anvil
Code Issues Proposed changes

Update patches under nova and keystone wrt grizzly

Browse Source 
Original files have been modified in grizzly
as compared to folsom.

Change-Id: I81db8898b0988cf2723b8c49d76811113890c932
This commit is contained in:
Meghal Gosalia 2013-05-02 22:24:44 +00:00
parent 318b7fe34f
commit c763b98430
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
conf/patches/keystone/keystone-newdeps.patch
View File

@ -1,5 +1,24 @@
--- keystone-2012.1/keystone/__init__.py.newdeps 2012-02-29 11:16:06.000000000 +0100
+++ keystone-2012.1/keystone/__init__.py 2012-03-01 22:42:08.546503618 +0100
--- 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
@ -30,21 +49,3 @@
+# TODO: See can we get pkg_resources to do the right thing directly
+import paste
+paste.__path__.insert(0, paste.__path__.pop(-1))
--- keystone-2012.1/bin/keystone-all.orig 2012-11-09 22:44:31.000000000 +0000
+++ keystone-2012.1/bin/keystone-all 2012-11-09 23:49:04.560249926 +0000
@@ -20,13 +20,13 @@
eventlet.patcher.monkey_patch(all=False, socket=True, time=True, thread=True)
-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 paste import deploy
+
CONF = config.CONF

14
conf/patches/nova/nova-deps.patch
View File

@ -1,9 +1,9 @@
--- nova-2012.2.1/nova/__init__.py.orig 2012-11-10 00:12:05.519266593 +0000
+++ nova-2012.2.1/nova/__init__.py 2012-11-10 00:13:32.515948084 +0000
@@ -31,6 +31,37 @@
.. moduleauthor:: Andy Smith <andy@anarkystic.com>
--- 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
+
@ -34,7 +34,5 @@
+import paste
+paste.__path__.insert(0, paste.__path__.pop(-1))
+
+
import gettext