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
This commit is contained in:
Bryan Schwerer 2022-07-19 15:21:37 -04:00
parent fa49b1803f
commit 570a1d4339

View File

@ -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