summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-01-28 18:16:51 +0000
committerFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-02-11 18:30:36 +0000
commitc16e5c87161108761babd59bf5fa7235d84d7639 (patch)
tree2d02a4b6e7d9421af02f61b341610a19bc7a1b9b
parentc17c7463ebb72528f2d94bf0ed5cdc0a6e5534cd (diff)
downloaddefinitions-c16e5c87161108761babd59bf5fa7235d84d7639.tar.gz
Try to fixup the previous commit
-rw-r--r--openstack-neutron.configure3
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service2
-rw-r--r--openstack/etc/systemd/system/openvswitch-db-server.service4
-rw-r--r--openstack/etc/systemd/system/openvswitch-setup.service4
4 files changed, 8 insertions, 5 deletions
diff --git a/openstack-neutron.configure b/openstack-neutron.configure
index 2da43cb6..350d4ca9 100644
--- a/openstack-neutron.configure
+++ b/openstack-neutron.configure
@@ -42,6 +42,9 @@ sed -f "$ROOT"/etc/openstack-neutron-setup.sed -i \
##########################################################################
+ln -sf "/etc/systemd/system/openvswitch-create-links-one-node.service" \
+ "$ROOT/etc/systemd/system/multi-user.target.wants/openvswitch-create-links-one-node.service"
+
ln -sf "/etc/systemd/system/openstack-neutron-network-configuration-one-node.service" \
"$ROOT/etc/systemd/system/multi-user.target.wants/openstack-neutron-network-configuration-one-node.service"
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 85bdb98c..ae04631f 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
@@ -1,7 +1,7 @@
[Unit]
Description=Configuration script to set Openstack in one node networking
Requires=openvswitch-setup.service openvswitch-db-server.service openvswitch.service
-After=network-online.target openvswitch-setup.service openvswitch-db-server.service openvswitch.service openvswitch-create-links-one-node.service
+After=network-online.target openvswitch-setup.service openvswitch-db-server.service
[Service]
Type=simple
diff --git a/openstack/etc/systemd/system/openvswitch-db-server.service b/openstack/etc/systemd/system/openvswitch-db-server.service
index d3f4998f..e43fbadc 100644
--- a/openstack/etc/systemd/system/openvswitch-db-server.service
+++ b/openstack/etc/systemd/system/openvswitch-db-server.service
@@ -1,7 +1,7 @@
[Unit]
Description=Open vSwitch Database server Daemon
-Requires=openvswitch-setup.service openvswitch-create-links-one-node.service
-After=network-online.target openvswitch-setup.service openvswitch-create-links-one-node.service
+Requires=openvswitch-setup.service
+After=network-online.target openvswitch-setup.service
[Service]
Type=forking
diff --git a/openstack/etc/systemd/system/openvswitch-setup.service b/openstack/etc/systemd/system/openvswitch-setup.service
index ad7a144f..cd68b5e2 100644
--- a/openstack/etc/systemd/system/openvswitch-setup.service
+++ b/openstack/etc/systemd/system/openvswitch-setup.service
@@ -1,7 +1,7 @@
[Unit]
Description=Run openvswitch-setup (once)
-Requires=local-fs.target network-online.target openvswitch-create-links-one-node.service
-After=network-online.target openvswitch-create-links-one-node.service
+Requires=local-fs.target network-online.target
+After=network-online.target
[Service]
Type=oneshot