commit dc7c191303ef0f48afad6c6fd52844a9b335d04a Author: asarfaty Date: Thu Oct 15 07:15:32 2020 +0200 Prepare the new W branch Change-Id: I076b563c42fd88495203c708f724f693df793c92 diff --git a/requirements.txt b/requirements.txt index f554576..2ec6e2b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,15 +32,15 @@ decorator>=4.4.1 # BSD # These repos are installed from git in OpenStack CI if the job # configures them as required-projects: -neutron>=16.0.0.0 # Apache-2.0 +neutron>=17.0.0.0 # Apache-2.0 networking-l2gw>=16.0.0 # Apache-2.0 -networking-sfc>=9.0.0.0 # Apache-2.0 +networking-sfc>=10.0.0.0 # Apache-2.0 neutron-fwaas>=16.0.0.0 # Apache-2.0 -neutron-vpnaas>=16.0.0.0 # Apache-2.0 +neutron-vpnaas>=17.0.0.0 # Apache-2.0 neutron-dynamic-routing>=16.0.0.0 # Apache-2.0 vmware-nsxlib>=16.0.0 # Apache-2.0 -# NOTE: we require octavia but can't depend on it for Stein -# octavia>=6.0.0.0 # Apache-2.0 +# NOTE: we require octavia but can't depend on it +# octavia>=7.0.0.0 # Apache-2.0 # The comment below indicates this project repo is current with neutron-lib # and should receive neutron-lib consumption patches as they are released diff --git a/vmware_nsx/db/migration/alembic_migrations/versions/queens/contract/717f7f63a219_nsxv3_lbaas_l7policy.py b/vmware_nsx/db/migration/alembic_migrations/versions/queens/contract/717f7f63a219_nsxv3_lbaas_l7policy.py index a1dfc72..48937e0 100644 --- a/vmware_nsx/db/migration/alembic_migrations/versions/queens/contract/717f7f63a219_nsxv3_lbaas_l7policy.py +++ b/vmware_nsx/db/migration/alembic_migrations/versions/queens/contract/717f7f63a219_nsxv3_lbaas_l7policy.py @@ -31,7 +31,7 @@ down_revision = 'a1be06050b41' # milestone identifier, used by neutron-db-manage neutron_milestone = [migration.QUEENS, migration.ROCKY, migration.STEIN, - migration.TRAIN, migration.USSURI] + migration.TRAIN, migration.USSURI, migration.VICTORIA] def upgrade(): diff --git a/vmware_nsx/db/migration/alembic_migrations/versions/stein/expand/99bfcb6003c6_lbaas_error_no_member.py b/vmware_nsx/db/migration/alembic_migrations/versions/stein/expand/99bfcb6003c6_lbaas_error_no_member.py index 8dbe87b..523966d 100644 --- a/vmware_nsx/db/migration/alembic_migrations/versions/stein/expand/99bfcb6003c6_lbaas_error_no_member.py +++ b/vmware_nsx/db/migration/alembic_migrations/versions/stein/expand/99bfcb6003c6_lbaas_error_no_member.py @@ -28,7 +28,8 @@ revision = '99bfcb6003c6' down_revision = 'fc6308289aca' # milestone identifier, used by neutron-db-manage -neutron_milestone = [migration.STEIN, migration.TRAIN, migration.USSURI] +neutron_milestone = [migration.STEIN, migration.TRAIN, migration.USSURI, + migration.VICTORIA] def upgrade():