Merge lp:~jk0/nova/lp803186 into lp:~hudson-openstack/nova/trunk

[Josh Kearney]

Put possible_topdir back in nova-api.

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

[Rick Harris (rconradharris)]

lgtm

review: Approve

=== modified file 'bin/nova-api'
--- bin/nova-api	2011-06-24 01:31:00 +0000
+++ bin/nova-api	2011-06-28 22:29:43 +0000
@@ -23,8 +23,14 @@
 
 """
 
+import os
 import sys
 
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
+        sys.argv[0]), os.pardir, os.pardir))
+if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
+    sys.path.insert(0, possible_topdir)
+
 import nova.service
 import nova.utils
 
 
=== modified file 'nova/db/sqlalchemy/migrate_repo/versions/027_add_provider_firewall_rules.py'
--- nova/db/sqlalchemy/migrate_repo/versions/027_add_provider_firewall_rules.py	2011-06-23 17:28:13 +0000
+++ nova/db/sqlalchemy/migrate_repo/versions/027_add_provider_firewall_rules.py	2011-06-28 22:29:43 +0000
@@ -58,8 +58,7 @@
         Column('to_port', Integer()),
         Column('cidr',
                String(length=255, convert_unicode=False, assert_unicode=None,
-                      unicode_error=None, _warn_on_bytestring=False))
-        )
+                      unicode_error=None, _warn_on_bytestring=False)))
 
 
 def upgrade(migrate_engine):