From 570a1d43392af99b084649a4113b56ad74b9903d Mon Sep 17 00:00:00 2001 From: Bryan Schwerer Date: Tue, 19 Jul 2022 15:21:37 -0400 Subject: [PATCH] Corrected the config file to use when stopping neutron-openvswitch-agent The use of file ml12_conf.ini has been deprecated, replaced by /etc/neutron/plugins/ml2/openvswitch_agent.ini. The command to cleanup the agent still references the old file. Just fix the filename https: //bugs.launchpad.net/kolla-ansible/+bug/1982222 Change-Id: I0fe7f68eda55e0c7d9960016bba74f5ba1ae223e --- tools/cleanup-containers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cleanup-containers b/tools/cleanup-containers index 82683fa575..16f7ccf441 100755 --- a/tools/cleanup-containers +++ b/tools/cleanup-containers @@ -24,7 +24,7 @@ fi if [[ "${containers_to_kill}" =~ "openvswitch_vswitchd" ]] && [[ "${containers_running}" =~ "neutron_openvswitch_agent" ]]; then echo "Removing ovs bridge..." (sudo docker exec -u root neutron_openvswitch_agent neutron-ovs-cleanup \ - --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \ + --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini \ --ovs_all_ports) > /dev/null (sudo docker exec -it openvswitch_vswitchd bash -c 'for br in `ovs-vsctl list-br`;do ovs-vsctl --if-exists del-br $br;done') > /dev/null fi