Update DEB specs to v. 2014.1.1

[openstack-build/neutron-build.git] / debian / neutron-vpn-agent.upstart

diff --git a/debian/neutron-vpn-agent.upstart b/debian/neutron-vpn-agent.upstart
index 901875fee3659df506e89504ecc16646e59d7a0e..bf983dc132a64d1e97f66c518608f4ffbb079b6c 100644 (file)
--- a/debian/neutron-vpn-agent.upstart
+++ b/debian/neutron-vpn-agent.upstart
@@ -12,8 +12,14 @@ 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-vpn-agent
+  fi
 end script
 
 exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \
        --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \
-       --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/vpn_agent.log
+       --config-file=/etc/neutron/l3_agent.ini --config-file=/etc/neutron/fwaas_driver.ini \
+       --log-file=/var/log/neutron/vpn_agent.log