Code Review
/
openstack-build
/
neutron-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update specs to v. 2014.1.b3
[openstack-build/neutron-build.git]
/
debian
/
neutron-dhcp-agent.upstart
diff --git
a/debian/neutron-dhcp-agent.upstart
b/debian/neutron-dhcp-agent.upstart
index 9d19eac9604a30d1d03434af59be9a0908008eff..3b08cd60561402e5970cf39ab518b278abac684d 100644
(file)
--- a/
debian/neutron-dhcp-agent.upstart
+++ b/
debian/neutron-dhcp-agent.upstart
@@
-12,6
+12,11
@@
chdir /var/run
pre-start script
mkdir -p /var/run/neutron
chown neutron:root /var/run/neutron
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-dhcp-agent
+ fi
end script
exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-dhcp-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini --log-file=/var/log/neutron/dhcp-agent.log
end script
exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-dhcp-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini --log-file=/var/log/neutron/dhcp-agent.log