summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-01 14:39:04 (GMT)
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-05-01 17:08:55 (GMT)
commitef27c10c212547850b314ebb53ce714fb07dbb0e (patch)
tree8e0afc0be4e9995c7fa4d7563c7baf417c3d4d0b
parentb3665368d3b4532d6afeba58b72e07118f8a07ba (diff)
downloaddefinitions-baserock/tiagogomes/openstack-tidy-up-3.tar.gz
openstack: ensure that /var/run/openvswitch existsbaserock/tiagogomes/openstack-tidy-up-3
This directory is created by the setup script, but as /var/run is a symbolic link to /run, which is a tmpfs mounting point, the directory will not persist across reboots. Hence, ensure that the directory exists before starting the services that require it. Note that we can't get away by adding the openvswitch-setup.service to the Wants of openvswitch.service and openvswitch-db-server.services, as those are enabled and started by the Ansible setup script, and so would create a deadlock. Also, remove non-existent service from the After section.
-rw-r--r--openstack/usr/lib/systemd/system/openvswitch-db-server.service1
-rw-r--r--openstack/usr/lib/systemd/system/openvswitch.service2
2 files changed, 2 insertions, 1 deletions
diff --git a/openstack/usr/lib/systemd/system/openvswitch-db-server.service b/openstack/usr/lib/systemd/system/openvswitch-db-server.service
index 7ea7942..34a7c81 100644
--- a/openstack/usr/lib/systemd/system/openvswitch-db-server.service
+++ b/openstack/usr/lib/systemd/system/openvswitch-db-server.service
@@ -4,6 +4,7 @@ After=local-fs.target
[Service]
Type=forking
+ExecStartPre=-/usr/bin/mkdir -p /var/run/openvswitch
ExecStart=/usr/sbin/ovsdb-server --remote=punix:/var/run/openvswitch/db.sock --remote=db:Open_vSwitch,Open_vSwitch,manager_options --private-key=db:Open_vSwitch,SSL,private_key --certificate=db:Open_vSwitch,SSL,certificate --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert --pidfile --detach
[Install]
diff --git a/openstack/usr/lib/systemd/system/openvswitch.service b/openstack/usr/lib/systemd/system/openvswitch.service
index 70a640d..113911f 100644
--- a/openstack/usr/lib/systemd/system/openvswitch.service
+++ b/openstack/usr/lib/systemd/system/openvswitch.service
@@ -1,11 +1,11 @@
[Unit]
Description=Open vSwitch Daemon
-After=openvswitch-initialize-db.service
Before=network-pre.target
Wants=network-pre.target
[Service]
Type=forking
+ExecStartPre=-/usr/bin/mkdir -p /var/run/openvswitch
ExecStart=/usr/sbin/ovs-vswitchd --pidfile --detach
[Install]