diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2015-03-09 16:18:32 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2015-03-23 22:58:55 +0000 |
| commit | 76309220725bb9de08721e2fd04aec699c221814 (patch) | |
| tree | d4295f3a9a287f7b95ba91329f2a76358a3eb745 | |
| parent | bc65346ba7c701a095fbebf5975e95a14d707b72 (diff) | |
| download | definitions-76309220725bb9de08721e2fd04aec699c221814.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.
| -rw-r--r-- | openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service | 6 |
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 \ |