summaryrefslogtreecommitdiff
path: root/openstack/etc/systemd/system
diff options
context:
space:
mode:
authorFrancisco Redondo Marchena <francisco.marchena@codethink.co.uk>2015-01-28 10:32:57 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2015-01-28 17:37:30 +0000
commita7a465ca482fcd4e9cdfb0613f90fdaa234e5e78 (patch)
tree2a96d535b591bd1d17098cc311e49bfaa9f48e37 /openstack/etc/systemd/system
parent0f3469b5ac230d831c191776bcecdd50da558295 (diff)
downloaddefinitions-a7a465ca482fcd4e9cdfb0613f90fdaa234e5e78.tar.gz
Recreate links on boot and set bridges to ethernet automatically
openvswitch services need to run after network-online.target in order to have the ethernet device available and configured.
Diffstat (limited to 'openstack/etc/systemd/system')
-rw-r--r--openstack/etc/systemd/system/openstack-neutron-network-configuration-one-node.service2
-rw-r--r--openstack/etc/systemd/system/openvswitch-create-links-one-node.service11
-rw-r--r--openstack/etc/systemd/system/openvswitch-db-server.service4
-rw-r--r--openstack/etc/systemd/system/openvswitch-setup.service3
-rw-r--r--openstack/etc/systemd/system/openvswitch.service4
5 files changed, 18 insertions, 6 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 9dbbf49b..85bdb98c 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.target 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
[Service]
Type=simple
diff --git a/openstack/etc/systemd/system/openvswitch-create-links-one-node.service b/openstack/etc/systemd/system/openvswitch-create-links-one-node.service
new file mode 100644
index 00000000..0ffcf3e2
--- /dev/null
+++ b/openstack/etc/systemd/system/openvswitch-create-links-one-node.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Create Veth pairs
+After=network-online.target
+
+[Service]
+Type=simple
+ExecStart=/usr/share/openstack/create_openvswitch_veth_pairs
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/openstack/etc/systemd/system/openvswitch-db-server.service b/openstack/etc/systemd/system/openvswitch-db-server.service
index 8fc5ecb1..d3f4998f 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
-After=openvswitch-setup.service
+Requires=openvswitch-setup.service openvswitch-create-links-one-node.service
+After=network-online.target openvswitch-setup.service openvswitch-create-links-one-node.service
[Service]
Type=forking
diff --git a/openstack/etc/systemd/system/openvswitch-setup.service b/openstack/etc/systemd/system/openvswitch-setup.service
index ff55909d..ad7a144f 100644
--- a/openstack/etc/systemd/system/openvswitch-setup.service
+++ b/openstack/etc/systemd/system/openvswitch-setup.service
@@ -1,6 +1,7 @@
[Unit]
Description=Run openvswitch-setup (once)
-Requires=local-fs.target network.target
+Requires=local-fs.target network-online.target openvswitch-create-links-one-node.service
+After=network-online.target openvswitch-create-links-one-node.service
[Service]
Type=oneshot
diff --git a/openstack/etc/systemd/system/openvswitch.service b/openstack/etc/systemd/system/openvswitch.service
index 25320190..3da9e345 100644
--- a/openstack/etc/systemd/system/openvswitch.service
+++ b/openstack/etc/systemd/system/openvswitch.service
@@ -1,7 +1,7 @@
[Unit]
Description=Open vSwitch Daemon
-Requires=network.target openvswitch-db-server.service openvswitch-initialize-db.service
-After=network.target openvswitch-db-server.service openvswitch-initialize-db.service
+Requires=network-online.target openvswitch-db-server.service openvswitch-initialize-db.service
+After=network-online.target openvswitch-db-server.service openvswitch-initialize-db.service
[Service]
Type=forking