diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-05-01 14:39:04 +0000 |
|---|---|---|
| committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-05-07 10:07:24 +0000 |
| commit | 8d242b1f97ce7a6866ee3f49ce482ee3d35d120f (patch) | |
| tree | 4f588383dd9379dd2411ee85a21d7446abc64134 | |
| parent | 10bd5fe11f0b18b481b2bf0b20ab6004b7a4a80d (diff) | |
| download | definitions-8d242b1f97ce7a6866ee3f49ce482ee3d35d120f.tar.gz | |
openstack: ensure that /var/run/openvswitch exists
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.service | 1 | ||||
| -rw-r--r-- | openstack/usr/lib/systemd/system/openvswitch.service | 2 |
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 7ea7942a..34a7c812 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 70a640de..113911f6 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] |