summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-07-27 16:34:55 -0500
committerJosh Kearney <josh@jk0.org>2011-07-27 16:34:55 -0500
commit0b4e10a48e2aaa816ce4ca4565068d1655ad53ef (patch)
tree2bd4007474a5409039045b260b112827dadf9a97
parent7d02bd555d7519d485d00e02136d26a6e4e7096e (diff)
downloadnova-0b4e10a48e2aaa816ce4ca4565068d1655ad53ef.tar.gz
Fail silently.
-rw-r--r--nova/db/sqlalchemy/migrate_repo/versions/034_change_instance_id_in_migrations.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/034_change_instance_id_in_migrations.py b/nova/db/sqlalchemy/migrate_repo/versions/034_change_instance_id_in_migrations.py
index 9a447c270f..4e8eaf0fd3 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/034_change_instance_id_in_migrations.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/034_change_instance_id_in_migrations.py
@@ -36,8 +36,11 @@ def upgrade(migrate_engine):
migrations.create_column(instance_uuid)
if migrate_engine.name == "mysql":
- migrate_engine.execute("ALTER TABLE migrations DROP FOREIGN KEY " \
- "`migrations_ibfk_1`;")
+ try:
+ migrate_engine.execute("ALTER TABLE migrations DROP FOREIGN KEY " \
+ "`migrations_ibfk_1`;")
+ except Exception: # Don't care, just fail silently.
+ pass
migrations.c.instance_id.drop()