Do not check ovs-cleanup job status on l3/dhcp agents start

Closes-Bug: #1562565

Change-Id: I5536fc6f20ea05c415ccf8be4717174f8cda5de7

diff --git a/trusty/debian/neutron-dhcp-agent.upstart b/trusty/debian/neutron-dhcp-agent.upstart
index 2cd3165be2e315a930803e5fd7d0339bf4641f06..6c0edfa8e9a974798b023b9d30b46dbdf06cc07d 100644 (file)
--- a/trusty/debian/neutron-dhcp-agent.upstart
+++ b/trusty/debian/neutron-dhcp-agent.upstart
@@ -12,11 +12,6 @@ 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-dhcp-agent
-  fi
 end script
 
 exec start-stop-daemon --start --chuid neutron: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

diff --git a/trusty/debian/neutron-l3-agent.upstart b/trusty/debian/neutron-l3-agent.upstart
index 6a11fd5e21bfc1c7452b3a3a8bc47c93a86bed51..e4c65416a3b186e5415c12e57e17e5a8880010df 100644 (file)
--- a/trusty/debian/neutron-l3-agent.upstart
+++ b/trusty/debian/neutron-l3-agent.upstart
@@ -12,11 +12,6 @@ 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:neutron --exec /usr/bin/neutron-l3-agent -- \