summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-02 14:12:04 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-11 18:30:36 +0000
commit22499d6667a131b6bc0f12f1815f3156fc058778 (patch)
tree3de62cab2465f8c3f690522fcfbd728189259277
parent14a620e031ecabf74fba39213a8d8e0c148e051c (diff)
downloaddefinitions-22499d6667a131b6bc0f12f1815f3156fc058778.tar.gz
Fix issues in neutron and openvswitch services
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service2
-rw-r--r--openstack/etc/systemd/system/openvswitch-create-links-one-node.service2
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