From: Jakub Libosvar Date: Mon, 27 Jan 2014 18:20:51 +0000 (+0100) Subject: Drop service* tables only if they exist X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d26bd87919990923b6fc85779f03705514d8d0b3;p=openstack-build%2Fneutron-build.git 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 --- 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 17492afc8..81fe08b32 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):