From effcf9f822566923c8bf20420b8cd14492169ab5 Mon Sep 17 00:00:00 2001 From: Jakub Libosvar Date: Mon, 27 Jan 2014 19:20:51 +0100 Subject: [PATCH] Drop service* tables only if they exist Tables servicedefinitions and servicetypes are not used by neutron but created using db migration tool. If quantum-server in grizzly was started without using migration tool then tables mentioned above are not created. During migration from grizzly to havana alembic attempts to drop these unused tables. This patch uses "IF EXISTS" clause when dropping mentioned tables. Closes-bug: #1273355 Change-Id: I33fcb3e1dc96ce37ec9c00987cb5a3a953ca691d --- .../versions/557edfc53098_new_service_types.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/neutron/db/migration/alembic_migrations/versions/557edfc53098_new_service_types.py b/neutron/db/migration/alembic_migrations/versions/557edfc53098_new_service_types.py index 17492afc84..81fe08b327 100644 --- a/neutron/db/migration/alembic_migrations/versions/557edfc53098_new_service_types.py +++ b/neutron/db/migration/alembic_migrations/versions/557edfc53098_new_service_types.py @@ -50,9 +50,8 @@ def upgrade(active_plugins=None, options=None): nullable=False, unique=True), ) - # dropping unused tables - op.drop_table('servicedefinitions') - op.drop_table('servicetypes') + for table in ('servicedefinitions', 'servicetypes'): + op.execute("DROP TABLE IF EXISTS %s" % table) def downgrade(active_plugins=None, options=None):