From 22499d6667a131b6bc0f12f1815f3156fc058778 Mon Sep 17 00:00:00 2001 From: Francisco Redondo Marchena Date: Mon, 2 Feb 2015 14:12:04 +0000 Subject: Fix issues in neutron and openvswitch services --- openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service | 2 +- openstack/etc/systemd/system/openvswitch-create-links-one-node.service | 2 +- 2 files changed, 2 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 290ac3a8..5eaf8a30 100644 --- a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service +++ b/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service @@ -1,11 +1,11 @@ [Unit] Description=Neutron OVS cleanup After=network-online.target openstack-neutron-setup.service +ConditionFileIsExecutable=/usr/bin/neutron-ovs-cleanup [Service] Type=simple User=neutron -ConditionFileIsExecutable=/usr/bin/neutron-ovs-cleanup ExecStart=/usr/bin/neutron-ovs-cleanup \ --log-file /var/log/neutron/ovs-cleanup.log \ --config-file /etc/neutron/neutron.conf --verbose diff --git a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service b/openstack/etc/systemd/system/openvswitch-create-links-one-node.service index 15365eaf..bacfc433 100644 --- a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service +++ b/openstack/etc/systemd/system/openvswitch-create-links-one-node.service @@ -7,7 +7,7 @@ After=network-online.target openstack-neutron-network-configuration-one-node.ser Type=oneshot ExecStart=/usr/share/openstack/create_openvswitch_veth_pairs RemainAfterExit=yes -Reboot=no +Restart=no [Install] WantedBy=multi-user.target -- cgit v1.2.1