summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-06-17 14:49:54 +0000
committerJohannes Erdfelt <johannes.erdfelt@rackspace.com>2011-06-17 14:49:54 +0000
commite628ce781b7fa54f87eba919f59bccf34bd8faac (patch)
tree581a2befa3ee56fafdc6764fc9c8ef47dcb81371
parenta6687f56e0ebb23d59fc4b4097b5877f57312a95 (diff)
downloadnova-e628ce781b7fa54f87eba919f59bccf34bd8faac.tar.gz
nova-e628ce781b7fa54f87eba919f59bccf34bd8faac.tar.xz
nova-e628ce781b7fa54f87eba919f59bccf34bd8faac.zip
auto load table schema instead of stubbing it out
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/024_add_agent_table.py11
1 files changed, 3 insertions, 8 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/024_add_agent_table.py b/nova/db/sqlalchemy/migrate_repo/versions/024_add_agent_table.py
index b8a10c235..640e96138 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/024_add_agent_table.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/024_add_agent_table.py
@@ -49,14 +49,6 @@ builds = Table('agent_builds', meta,
)
-# Table stub-definitions
-# Just for the ForeignKey and column creation to succeed, these are not the
-# actual definitions of instances or services.
-#
-instances = Table('instances', meta,
- Column('id', Integer(), primary_key=True, nullable=False),
- )
-
#
# New Column
#
@@ -74,5 +66,8 @@ def upgrade(migrate_engine):
except Exception:
logging.info(repr(table))
+ instances = Table('instances', meta, autoload=True,
+ autoload_with=migrate_engine)
+
# Add columns to existing tables
instances.create_column(architecture)