From 2937d63fcff5b08b8451e07526f2f4c05ad4a2f7 Mon Sep 17 00:00:00 2001 From: Hirofumi Ichihara Date: Wed, 20 Dec 2017 16:18:06 +0900 Subject: [PATCH] Remove redundant gate config in scenario tests Each scenario test's config has set BGP_SCHEDULER_DRIVER but it's also defined in gate_hook.sh and it's applied to each scenario test. It's redundant that we set such duplicated config to devstack config. This patch removes the config from scenario tests. TrivialFix Change-Id: I4f7de61b389180d88cc983b07d027a4deb7a2978 --- .../run.yaml | 3 --- .../run.yaml | 3 --- .../run.yaml | 3 --- 3 files changed, 9 deletions(-) diff --git a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/run.yaml b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/run.yaml index bb7cda5a..697458c1 100644 --- a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/run.yaml +++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-basic/run.yaml @@ -42,9 +42,6 @@ DEVSTACK_LOCAL_CONFIG="NEUTRON_CREATE_INITIAL_NETWORKS=False" DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing git://git.openstack.org/openstack/neutron-dynamic-routing" DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin git://git.openstack.org/openstack/neutron-tempest-plugin" - if [ "basic" == "basic" ]; then - DEVSTACK_LOCAL_CONFIG+=$'\n'"BGP_SCHEDULER_DRIVER=neutron_dynamic_routing.services.bgp.scheduler.bgp_dragent_scheduler.ChanceScheduler" - fi export DEVSTACK_LOCAL_CONFIG function gate_hook { diff --git a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv4/run.yaml b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv4/run.yaml index 3f2bc40f..e89ff2d5 100644 --- a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv4/run.yaml +++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv4/run.yaml @@ -42,9 +42,6 @@ DEVSTACK_LOCAL_CONFIG="NEUTRON_CREATE_INITIAL_NETWORKS=False" DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing git://git.openstack.org/openstack/neutron-dynamic-routing" DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin git://git.openstack.org/openstack/neutron-tempest-plugin" - if [ "ipv4" == "basic" ]; then - DEVSTACK_LOCAL_CONFIG+=$'\n'"BGP_SCHEDULER_DRIVER=neutron_dynamic_routing.services.bgp.scheduler.bgp_dragent_scheduler.ChanceScheduler" - fi export DEVSTACK_LOCAL_CONFIG function gate_hook { diff --git a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv6/run.yaml b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv6/run.yaml index 6f641c0a..880b15bc 100644 --- a/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv6/run.yaml +++ b/playbooks/neutron-dynamic-routing-dsvm-tempest-scenario-ipv6/run.yaml @@ -42,9 +42,6 @@ DEVSTACK_LOCAL_CONFIG="NEUTRON_CREATE_INITIAL_NETWORKS=False" DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-dynamic-routing git://git.openstack.org/openstack/neutron-dynamic-routing" DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-tempest-plugin git://git.openstack.org/openstack/neutron-tempest-plugin" - if [ "ipv6" == "basic" ]; then - DEVSTACK_LOCAL_CONFIG+=$'\n'"BGP_SCHEDULER_DRIVER=neutron_dynamic_routing.services.bgp.scheduler.bgp_dragent_scheduler.ChanceScheduler" - fi export DEVSTACK_LOCAL_CONFIG function gate_hook {