From fd388c0d40fee6e67cf868ed71d0c90828cba152 Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Sun, 7 Apr 2019 08:33:35 +0300 Subject: [PATCH] Open Train DB branch Change-Id: Ib1c429fa31a4c77d9810f6b1f8ffa8d6d3cd822e --- neutron/db/migration/__init__.py | 2 ++ .../expand/9bfad3f1e780_support_shared_security_groups.py | 5 +++++ neutron/db/migration/cli.py | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/neutron/db/migration/__init__.py b/neutron/db/migration/__init__.py index bbae2d8152d..c5b1d773b8f 100644 --- a/neutron/db/migration/__init__.py +++ b/neutron/db/migration/__init__.py @@ -31,6 +31,7 @@ PIKE = 'pike' QUEENS = 'queens' ROCKY = 'rocky' STEIN = 'stein' +TRAIN = 'train' NEUTRON_MILESTONES = [ # earlier milestones were not tagged @@ -41,6 +42,7 @@ NEUTRON_MILESTONES = [ PIKE, QUEENS, ROCKY, + STEIN, # Do not add the milestone until the end of the release ] diff --git a/neutron/db/migration/alembic_migrations/versions/stein/expand/9bfad3f1e780_support_shared_security_groups.py b/neutron/db/migration/alembic_migrations/versions/stein/expand/9bfad3f1e780_support_shared_security_groups.py index bba9e5d442c..91fff0935d5 100644 --- a/neutron/db/migration/alembic_migrations/versions/stein/expand/9bfad3f1e780_support_shared_security_groups.py +++ b/neutron/db/migration/alembic_migrations/versions/stein/expand/9bfad3f1e780_support_shared_security_groups.py @@ -16,6 +16,8 @@ from alembic import op import sqlalchemy as sa +from neutron.db import migration + """support shared security groups @@ -29,6 +31,9 @@ Create Date: 2019-02-05 15:24:45.011378 revision = '9bfad3f1e780' down_revision = '0ff9e3881597' +# milestone identifier, used by neutron-db-manage +neutron_milestone = [migration.STEIN] + def upgrade(): op.create_table( diff --git a/neutron/db/migration/cli.py b/neutron/db/migration/cli.py index 620a9eb2cae..03957fbdbf7 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.STEIN +CURRENT_RELEASE = migration.TRAIN RELEASES = ( migration.LIBERTY, migration.MITAKA, @@ -48,6 +48,7 @@ RELEASES = ( migration.QUEENS, migration.ROCKY, migration.STEIN, + migration.TRAIN, ) EXPAND_BRANCH = 'expand'