From 43c3ae584ef920bcba909bddcbac4c193a0bc224 Mon Sep 17 00:00:00 2001
From: Larry Rensing <lr699s@att.com>
Date: Wed, 12 Apr 2017 10:25:05 -0500
Subject: [PATCH] Neutron ovs config file correction

OVS agent was pointing at the wrong config file, it should reference
'ml2_conf' rather than 'ml2-conf'.

Change-Id: I39d20d621f3634456498440cd4d35ac117cbe1f7
---
 neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl b/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl
index 233c8d7e64..9bcbd21930 100644
--- a/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl
+++ b/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl
@@ -38,6 +38,6 @@ EOF
 # it forces openvswitch agent
 exec sudo -E -u neutron neutron-openvswitch-agent \
 --config-file /etc/neutron/neutron.conf \
---config-file /etc/neutron/plugins/ml2/ml2-conf.ini \
+--config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
 --config-file /tmp/ml2-local-ip.ini \
---config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini 
+--config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini