openstack
/
nova
Code Issues Proposed changes

Fix for bug 803186 that fixes the ability for nova-api to run from a source checkout.

This commit is contained in:
Josh Kearney 2011-06-29 04:28:29 +00:00 committed by Tarmac
parent 83742f0812 834b1741b4
commit 04dcf46f1f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/nova-api
View File

@ -23,8 +23,14 @@ Starts both the EC2 and OpenStack APIs in separate processes.
"""
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

3
nova/db/sqlalchemy/migrate_repo/versions/027_add_provider_firewall_rules.py
View File

@ -58,8 +58,7 @@ provider_fw_rules = Table('provider_fw_rules', meta,
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):