X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fneutron-l3-agent.upstart;h=0b69d138543fb4f16315c48901379084464784fd;hb=bdc92022d63d3288882ce1b17332101def900ebf;hp=6677b902094fab88e8e095041fb2c7f8cbd313da;hpb=41c661dde15aa2524a423ced2815671886af8f36;p=openstack-build%2Fneutron-build.git

diff --git a/debian/neutron-l3-agent.upstart b/debian/neutron-l3-agent.upstart
index 6677b9020..0b69d1385 100644
--- a/debian/neutron-l3-agent.upstart
+++ b/debian/neutron-l3-agent.upstart
@@ -12,6 +12,13 @@ chdir /var/run
 pre-start script
   mkdir -p /var/run/neutron
   chown neutron:root /var/run/neutron
+  # Check to see if openvswitch plugin in use by checking
+  # status of cleanup upstart configuration
+  if status neutron-ovs-cleanup; then
+    start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-l3-agent
+  fi
 end script
 
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/l3-agent.log
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- \
+  --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini \
+  --config-file=/etc/neutron/fwaas_driver.ini --log-file=/var/log/neutron/l3-agent.log