diff --git a/neutron/db/migration/__init__.py b/neutron/db/migration/__init__.py index c5b1d773b8f..e11f006ab10 100644 --- a/neutron/db/migration/__init__.py +++ b/neutron/db/migration/__init__.py @@ -32,6 +32,7 @@ QUEENS = 'queens' ROCKY = 'rocky' STEIN = 'stein' TRAIN = 'train' +USSURI = 'ussuri' NEUTRON_MILESTONES = [ # earlier milestones were not tagged @@ -43,6 +44,7 @@ NEUTRON_MILESTONES = [ QUEENS, ROCKY, STEIN, + TRAIN, # Do not add the milestone until the end of the release ] diff --git a/neutron/db/migration/alembic_migrations/versions/train/expand/c613d0b82681_subnet_force_network_id.py b/neutron/db/migration/alembic_migrations/versions/train/expand/c613d0b82681_subnet_force_network_id.py index 0af8097cc5a..6748a641842 100644 --- a/neutron/db/migration/alembic_migrations/versions/train/expand/c613d0b82681_subnet_force_network_id.py +++ b/neutron/db/migration/alembic_migrations/versions/train/expand/c613d0b82681_subnet_force_network_id.py @@ -16,6 +16,8 @@ from alembic import op import sqlalchemy as sa +from neutron.db import migration + """subnet force network id @@ -29,6 +31,9 @@ Create Date: 2019-08-19 11:15:14.443244 revision = 'c613d0b82681' down_revision = '63fd95af7dcd' +# milestone identifier, used by neutron-db-manage +neutron_milestone = [migration.TRAIN] + def upgrade(): op.alter_column('subnets', 'network_id', nullable=False, diff --git a/neutron/db/migration/cli.py b/neutron/db/migration/cli.py index 03957fbdbf7..63ae736159b 100644 --- a/neutron/db/migration/cli.py +++ b/neutron/db/migration/cli.py @@ -38,7 +38,7 @@ HEADS_FILENAME = 'HEADS' CONTRACT_HEAD_FILENAME = 'CONTRACT_HEAD' EXPAND_HEAD_FILENAME = 'EXPAND_HEAD' -CURRENT_RELEASE = migration.TRAIN +CURRENT_RELEASE = migration.USSURI RELEASES = ( migration.LIBERTY, migration.MITAKA, @@ -49,6 +49,7 @@ RELEASES = ( migration.ROCKY, migration.STEIN, migration.TRAIN, + migration.USSURI, ) EXPAND_BRANCH = 'expand'