diff -Nru neutron-8.4.0/debian/changelog neutron-8.4.0/debian/changelog
--- neutron-8.4.0/debian/changelog	2017-12-12 10:36:08.000000000 -0800
+++ neutron-8.4.0/debian/changelog	2018-03-09 03:24:00.000000000 -0800
@@ -1,3 +1,11 @@
+neutron (2:8.4.0-0ubuntu7) xenial; urgency=medium
+
+  * Adding dependency to openvswitch-switch.service because
+    neutron-ovs-cleanup will be failed if it is running earlier than
+    ovsdb-server
+
+ -- Seyeong Kim <seyeong.kim@canonical.com>  Thu, 01 Mar 2018 17:19:08 -0800
+
 neutron (2:8.4.0-0ubuntu6) xenial; urgency=medium
 
   * d/p/set-ha-network-port-to-down-when-l3-agent-starts.patch,
diff -Nru neutron-8.4.0/debian/neutron-dhcp-agent.service.in neutron-8.4.0/debian/neutron-dhcp-agent.service.in
--- neutron-8.4.0/debian/neutron-dhcp-agent.service.in	1969-12-31 16:00:00.000000000 -0800
+++ neutron-8.4.0/debian/neutron-dhcp-agent.service.in	2018-03-09 03:23:42.000000000 -0800
@@ -0,0 +1,20 @@
+[Unit]
+Description=OpenStack Neutron DHCP agent
+After=mysql.service postgresql.service rabbitmq-server.service keystone.service neutron-ovs-cleanup.service 
+Requires=neutron-ovs-cleanup.service
+
+[Service]
+User=neutron
+Group=neutron
+Type=simple
+WorkingDirectory=/var/lib/neutron
+PermissionsStartOnly=true
+ExecStartPre=/bin/mkdir -p /var/lock/neutron /var/log/neutron /var/lib/neutron
+ExecStartPre=/bin/chown neutron:neutron /var/lock/neutron /var/log/neutron /var/lib/neutron
+ExecStart=/etc/init.d/neutron-dhcp-agent systemd-start
+Restart=on-failure
+LimitNOFILE=65535
+TimeoutStopSec=15
+
+[Install]
+WantedBy=multi-user.target
diff -Nru neutron-8.4.0/debian/neutron-l3-agent.service.in neutron-8.4.0/debian/neutron-l3-agent.service.in
--- neutron-8.4.0/debian/neutron-l3-agent.service.in	1969-12-31 16:00:00.000000000 -0800
+++ neutron-8.4.0/debian/neutron-l3-agent.service.in	2018-03-09 03:23:30.000000000 -0800
@@ -0,0 +1,21 @@
+[Unit]
+Description=OpenStack Neutron L3 agent
+After=mysql.service postgresql.service rabbitmq-server.service keystone.service openvswitch-switch.service neutron-ovs-cleanup.service 
+Requires=neutron-ovs-cleanup.service
+
+
+[Service]
+User=neutron
+Group=neutron
+Type=simple
+WorkingDirectory=/var/lib/neutron
+PermissionsStartOnly=true
+ExecStartPre=/bin/mkdir -p /var/lock/neutron /var/log/neutron /var/lib/neutron
+ExecStartPre=/bin/chown neutron:neutron /var/lock/neutron /var/log/neutron /var/lib/neutron
+ExecStart=/etc/init.d/neutron-l3-agent systemd-start
+Restart=on-failure
+LimitNOFILE=65535
+TimeoutStopSec=15
+
+[Install]
+WantedBy=multi-user.target
diff -Nru neutron-8.4.0/debian/neutron-openvswitch-agent.neutron-ovs-cleanup.service.in neutron-8.4.0/debian/neutron-openvswitch-agent.neutron-ovs-cleanup.service.in
--- neutron-8.4.0/debian/neutron-openvswitch-agent.neutron-ovs-cleanup.service.in	2017-12-12 10:36:08.000000000 -0800
+++ neutron-8.4.0/debian/neutron-openvswitch-agent.neutron-ovs-cleanup.service.in	2018-03-09 03:23:52.000000000 -0800
@@ -1,5 +1,7 @@
 [Unit]
 Description=OpenStack Neutron OVS cleanup
+Requires=openvswitch-switch.service
+After=openvswitch-switch.service
 
 [Service]
 Type=oneshot