From 4edf94041f4661ace892e5b76bab9ca17fc3970b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awek=20Kap=C5=82o=C5=84ski?= Date: Tue, 20 Dec 2022 11:05:05 +0100 Subject: [PATCH] Remove note about migration from lib/neutron-legacy to lib/neutron In [1] we finally got rid of the unfinished lib/neutron module and kept only lib/neutron-legacy. It's renamed to lib/neutron now and it's the only neutron related module in Devstack. So this patch removes left over todo comments about things to do when migration to the new lib/neutron module will be finished. [1] https://review.opendev.org/c/openstack/devstack/+/865014 Change-Id: Icd7030d36a2462263c9379e02c756d23f6ff6440 --- devstack/lib/ml2 | 2 +- zuul.d/grenade.yaml | 6 ------ zuul.d/tempest-multinode.yaml | 6 ------ zuul.d/tempest-singlenode.yaml | 3 --- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/devstack/lib/ml2 b/devstack/lib/ml2 index a5b55bd08c5..5d40f50e6f8 100644 --- a/devstack/lib/ml2 +++ b/devstack/lib/ml2 @@ -1,6 +1,6 @@ function configure_ml2_extension_drivers { if is_neutron_legacy_enabled; then - # NOTE(yamamoto): This overwrites what neutron-legacy set, + # NOTE(yamamoto): This overwrites what Devstack's neutron module set, # with the latest set of drivers. # While we modifies Q_ML2_PLUGIN_EXT_DRIVERS (via # neutron_ml2_extension_driver_add calls) in the post-config phase, diff --git a/zuul.d/grenade.yaml b/zuul.d/grenade.yaml index 3aed1a3035e..e27c1aa186f 100644 --- a/zuul.d/grenade.yaml +++ b/zuul.d/grenade.yaml @@ -148,9 +148,6 @@ $NEUTRON_CONF: DEFAULT: router_distributed: True - # NOTE(slaweq): We can get rid of this hardcoded absolute path when - # devstack-tempest job will be switched to use lib/neutron instead of - # lib/neutron-legacy "/$NEUTRON_CORE_PLUGIN_CONF": ml2: mechanism_drivers: openvswitch,l2population @@ -197,9 +194,6 @@ $NEUTRON_CONF: DEFAULT: router_distributed: True - # NOTE(slaweq): We can get rid of this hardcoded absolute path when - # devstack-tempest job will be switched to use lib/neutron instead of - # lib/neutron-legacy "/$NEUTRON_CORE_PLUGIN_CONF": agent: enable_distributed_routing: True diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml index 8231c82994a..0e25b520aca 100644 --- a/zuul.d/tempest-multinode.yaml +++ b/zuul.d/tempest-multinode.yaml @@ -83,9 +83,6 @@ DEFAULT: router_distributed: True l3_ha: True - # NOTE(slaweq): We can get rid of this hardcoded absolute path when - # devstack-tempest job will be switched to use lib/neutron instead of - # lib/neutron-legacy "/$NEUTRON_CORE_PLUGIN_CONF": ml2: mechanism_drivers: openvswitch,l2population @@ -141,9 +138,6 @@ $NEUTRON_CONF: DEFAULT: router_distributed: True - # NOTE(slaweq): We can get rid of this hardcoded absolute path when - # devstack-tempest job will be switched to use lib/neutron instead of - # lib/neutron-legacy "/$NEUTRON_CORE_PLUGIN_CONF": agent: enable_distributed_routing: True diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index 78e42ab8f2e..2bc49585e33 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -171,9 +171,6 @@ quota_floatingip: 500 quota_security_group: 100 quota_security_group_rule: 1000 - # NOTE(slaweq): We can get rid of this hardcoded absolute path when - # devstack-tempest job will be switched to use lib/neutron instead of - # lib/neutron-legacy "/$NEUTRON_CORE_PLUGIN_CONF": ml2_type_vlan: network_vlan_ranges: foo:1:10