summary refs log tree commit diff
path: root/nixos/modules/services/misc
diff options
context:
space:
mode:
authorUli Baum <xeji@cat3.de>2018-05-11 19:29:33 +0200
committerUli Baum <xeji@cat3.de>2018-05-11 19:37:31 +0200
commitec00b6fbb3669e1852f537a8b624c6102f3eeb32 (patch)
treef68e5fd389c7b0357d90b3cf8d32a6787b0b66a7 /nixos/modules/services/misc
parent0d2a4ed49c81a0cda44b406d454dc58637e94c3a (diff)
downloadnixlib-ec00b6fbb3669e1852f537a8b624c6102f3eeb32.tar
nixlib-ec00b6fbb3669e1852f537a8b624c6102f3eeb32.tar.gz
nixlib-ec00b6fbb3669e1852f537a8b624c6102f3eeb32.tar.bz2
nixlib-ec00b6fbb3669e1852f537a8b624c6102f3eeb32.tar.lz
nixlib-ec00b6fbb3669e1852f537a8b624c6102f3eeb32.tar.xz
nixlib-ec00b6fbb3669e1852f537a8b624c6102f3eeb32.tar.zst
nixlib-ec00b6fbb3669e1852f537a8b624c6102f3eeb32.zip
nixos/mesos-slave: start after docker
If docker is enabled, start mesos-slave.service after docker.service
to avoid a race condition that could result in mesos-slave to fail
with "Failed to create docker: Timed out getting docker version"
Diffstat (limited to 'nixos/modules/services/misc')
-rw-r--r--nixos/modules/services/misc/mesos-slave.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix
index effa29b64f63..468c7f36ecc5 100644
--- a/nixos/modules/services/misc/mesos-slave.nix
+++ b/nixos/modules/services/misc/mesos-slave.nix
@@ -187,7 +187,7 @@ in {
     systemd.services.mesos-slave = {
       description = "Mesos Slave";
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
+      after = [ "network.target" ] ++ optionals cfg.withDocker [ "docker.service" ] ;
       path = [ pkgs.runtimeShellPackage ];
       serviceConfig = {
         ExecStart = ''