From 16b57842e9f401ec107973898286eb8fe4de6212 Mon Sep 17 00:00:00 2001 From: Sergey Kolekonov Date: Sun, 27 Mar 2016 10:58:17 +0300 Subject: [PATCH] Do not check ovs-cleanup job status on l3/dhcp agents start Closes-Bug: #1562565 Change-Id: I5536fc6f20ea05c415ccf8be4717174f8cda5de7 --- trusty/debian/neutron-dhcp-agent.upstart | 5 ----- trusty/debian/neutron-l3-agent.upstart | 5 ----- 2 files changed, 10 deletions(-) diff --git a/trusty/debian/neutron-dhcp-agent.upstart b/trusty/debian/neutron-dhcp-agent.upstart index 2cd3165be..6c0edfa8e 100644 --- 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 6a11fd5e2..e4c65416a 100644 --- 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 -- \ -- 2.32.3