summaryrefslogtreecommitdiff
path: root/openstack/etc
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2015-03-09 16:18:32 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2015-03-20 15:22:29 +0000
commit761cf21367f393d522a2dae38531246a33d5a0fa (patch)
treee7da8354192d5ae70e8a41985f599b3ba2db9b84 /openstack/etc
parent53aa0d0333b976344b7bb069bfe484ed21a12475 (diff)
downloaddefinitions-761cf21367f393d522a2dae38531246a33d5a0fa.tar.gz
Only start neutron-openvswitch-plugin after cleanup has finished
ovs-cleanup is responsible for reconciling the state in openvswitch's database and neutron's configuration. This can fail if other services are also changing ovs configuration though, and the missing dependency resulted in neutron removing the interface while ovs-cleanup was about to do so.
Diffstat (limited to 'openstack/etc')
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service6
1 files changed, 4 insertions, 2 deletions
diff --git a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service b/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service
index 5eaf8a30..083cf701 100644
--- a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service
+++ b/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service
@@ -1,10 +1,12 @@
[Unit]
Description=Neutron OVS cleanup
-After=network-online.target openstack-neutron-setup.service
+After=network-online.target openstack-neutron-setup.service openvswitch.service
+Before=openstack-neutron-plugin-openvswitch-agent.service
ConditionFileIsExecutable=/usr/bin/neutron-ovs-cleanup
[Service]
-Type=simple
+Type=oneshot
+RemainAfterExit=yes
User=neutron
ExecStart=/usr/bin/neutron-ovs-cleanup \
--log-file /var/log/neutron/ovs-cleanup.log \