summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-30 16:40:39 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-11 18:30:36 +0000
commit0e8a574544f13e96bf35b454e5de6eca571f0e18 (patch)
tree2478d73e03871e30346b45f8b6417e59a75a1e14
parent351f8e7d001f79a0c86c9f6f00a3a2da2a37072d (diff)
downloaddefinitions-0e8a574544f13e96bf35b454e5de6eca571f0e18.tar.gz
Remove wants and transform bridge and links services in one shot
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service2
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service1
-rw-r--r--openstack/etc/systemd/system/openvswitch-create-links-one-node.service3
3 files changed, 2 insertions, 4 deletions
diff --git a/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service b/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service
index c68b3137..2b1d168b 100644
--- a/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service
+++ b/openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service
@@ -4,7 +4,7 @@ Wants=network-online.target
After=network-online.target openvswitch.service
[Service]
-Type=simple
+Type=oneshot
ExecStart=/usr/share/openstack/openstack-neutron-network-configuration-for-one-node
Restart=no
RemainAfterExit=yes
diff --git a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service b/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service
index c64eb16d..290ac3a8 100644
--- a/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service
+++ b/openstack/etc/systemd/system/openstack-neutron-ovs-cleanup.service
@@ -1,6 +1,5 @@
[Unit]
Description=Neutron OVS cleanup
-Wants=openstack-neutron-setup.service
After=network-online.target openstack-neutron-setup.service
[Service]
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 d6fa79b3..a80b5a02 100644
--- a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service
+++ b/openstack/etc/systemd/system/openvswitch-create-links-one-node.service
@@ -1,10 +1,9 @@
[Unit]
Description=Create Veth pairs
-Wants=openstack-neutron-network-configuration-one-node.service
After=network-online.target openstack-neutron-network-configuration-one-node.service
[Service]
-Type=simple
+Type=oneshot
ExecStart=/usr/share/openstack/create_openvswitch_veth_pairs
RemainAfterExit=yes
Reboot=no