From fa43fc2ffc97bb40de51d099358a97c9b26f04f7 Mon Sep 17 00:00:00 2001 From: Jakub Libosvar Date: Mon, 27 Jan 2014 18:09:26 +0100 Subject: [PATCH] Move db migration of ml2 security groups to havana ml2 plugin is a havana feature. Currently securitygroups table are created in chain of migration after havana release. It causes db migration failure when migrating from havana to current head because securitygroups table is attempted to be created although it was already created by create_all(). Closes-bug: #1271231 Change-Id: If450bd95de7a5fdfdb2219cfbf7eb0c1323044bb --- .../versions/49f5e553f61f_ml2_security_groups.py | 4 ++-- .../versions/8f682276ee4_ryu_plugin_quota.py | 4 ++-- .../migration/alembic_migrations/versions/havana_release.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/neutron/db/migration/alembic_migrations/versions/49f5e553f61f_ml2_security_groups.py b/neutron/db/migration/alembic_migrations/versions/49f5e553f61f_ml2_security_groups.py index 5a348d5a76..b7dd042d22 100644 --- a/neutron/db/migration/alembic_migrations/versions/49f5e553f61f_ml2_security_groups.py +++ b/neutron/db/migration/alembic_migrations/versions/49f5e553f61f_ml2_security_groups.py @@ -18,14 +18,14 @@ """security_groups Revision ID: 49f5e553f61f -Revises: ed93525fd003 +Revises: 27ef74513d33 Create Date: 2013-12-21 19:58:17.071412 """ # revision identifiers, used by Alembic. revision = '49f5e553f61f' -down_revision = 'ed93525fd003' +down_revision = '27ef74513d33' # Change to ['*'] if this migration applies to all plugins diff --git a/neutron/db/migration/alembic_migrations/versions/8f682276ee4_ryu_plugin_quota.py b/neutron/db/migration/alembic_migrations/versions/8f682276ee4_ryu_plugin_quota.py index d6efa81382..110f206e33 100644 --- a/neutron/db/migration/alembic_migrations/versions/8f682276ee4_ryu_plugin_quota.py +++ b/neutron/db/migration/alembic_migrations/versions/8f682276ee4_ryu_plugin_quota.py @@ -18,14 +18,14 @@ """ryu plugin quota Revision ID: 8f682276ee4 -Revises: 49f5e553f61f +Revises: ed93525fd003 Create Date: 2014-01-07 15:47:17.349425 """ # revision identifiers, used by Alembic. revision = '8f682276ee4' -down_revision = '49f5e553f61f' +down_revision = 'ed93525fd003' # Change to ['*'] if this migration applies to all plugins diff --git a/neutron/db/migration/alembic_migrations/versions/havana_release.py b/neutron/db/migration/alembic_migrations/versions/havana_release.py index a8dc05d968..5fd9a36335 100644 --- a/neutron/db/migration/alembic_migrations/versions/havana_release.py +++ b/neutron/db/migration/alembic_migrations/versions/havana_release.py @@ -18,14 +18,14 @@ """havana Revision ID: havana -Revises: 1341ed32cc1e +Revises: 49f5e553f61f Create Date: 2013-10-02 00:00:00.000000 """ # revision identifiers, used by Alembic. revision = 'havana' -down_revision = '27ef74513d33' +down_revision = '49f5e553f61f' # Change to ['*'] if this migration applies to all plugins