diff --git a/neutron_vpnaas/db/migration/alembic_migrations/versions/newton/contract/b6a2519ab7dc_rename_tenant_to_project.py b/neutron_vpnaas/db/migration/alembic_migrations/versions/newton/contract/b6a2519ab7dc_rename_tenant_to_project.py index e95509c02..079c1e46f 100644 --- a/neutron_vpnaas/db/migration/alembic_migrations/versions/newton/contract/b6a2519ab7dc_rename_tenant_to_project.py +++ b/neutron_vpnaas/db/migration/alembic_migrations/versions/newton/contract/b6a2519ab7dc_rename_tenant_to_project.py @@ -32,7 +32,7 @@ revision = 'b6a2519ab7dc' down_revision = '2cb4ee992b41' # milestone identifier, used by neutron-db-manage -neutron_milestone = [migration.NEWTON] +neutron_milestone = [migration.NEWTON, migration.OCATA] _INSPECTOR = None diff --git a/neutron_vpnaas/db/migration/alembic_migrations/versions/ocata/expand/38893903cbde_add_auth_algorithm_sha384_and_sha512.py b/neutron_vpnaas/db/migration/alembic_migrations/versions/ocata/expand/38893903cbde_add_auth_algorithm_sha384_and_sha512.py index 7980e13a5..6aeafd06a 100644 --- a/neutron_vpnaas/db/migration/alembic_migrations/versions/ocata/expand/38893903cbde_add_auth_algorithm_sha384_and_sha512.py +++ b/neutron_vpnaas/db/migration/alembic_migrations/versions/ocata/expand/38893903cbde_add_auth_algorithm_sha384_and_sha512.py @@ -21,12 +21,16 @@ Create Date: 2016-11-04 18:00:49.219140 """ +from neutron.db import migration +import sqlalchemy as sa + + # revision identifiers, used by Alembic. revision = '38893903cbde' down_revision = '52783a36bd67' -from neutron.db import migration -import sqlalchemy as sa +# milestone identifier, used by neutron-db-manage +neutron_milestone = [migration.OCATA] new_auth = sa.Enum('sha1', 'sha256', 'sha384', 'sha512', name='vpn_auth_algorithms')