summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-07-27 22:28:58 +0000
committerTarmac <>2011-07-27 22:28:58 +0000
commit0fc7f1220139318cfb9cd181324cce653cc27f58 (patch)
treee55bff66fe963e524cb28de88946b0b6bb4dc914
parentad00ca903b98fc33eca9f375b1e5dd146142839f (diff)
parenta57115ef474440f21a500ce4f8970a9fcd99840e (diff)
downloadnova-0fc7f1220139318cfb9cd181324cce653cc27f58.tar.gz
nova-0fc7f1220139318cfb9cd181324cce653cc27f58.tar.xz
nova-0fc7f1220139318cfb9cd181324cce653cc27f58.zip
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 9a447c270..4e8eaf0fd 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()