summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorCharles Strahan <charles.c.strahan@gmail.com>2015-05-10 18:13:00 -0400
committerCharles Strahan <charles.c.strahan@gmail.com>2015-05-10 19:36:20 -0400
commitba186ec4b9a8fc8e86f8e6851f5f3a21cf5f183f (patch)
tree3f60c1343156eee00bd06152997820f9ebfb6e50 /nixos
parent760169663e9d96db9a3917067fa982ac044107e4 (diff)
downloadnixlib-ba186ec4b9a8fc8e86f8e6851f5f3a21cf5f183f.tar
nixlib-ba186ec4b9a8fc8e86f8e6851f5f3a21cf5f183f.tar.gz
nixlib-ba186ec4b9a8fc8e86f8e6851f5f3a21cf5f183f.tar.bz2
nixlib-ba186ec4b9a8fc8e86f8e6851f5f3a21cf5f183f.tar.lz
nixlib-ba186ec4b9a8fc8e86f8e6851f5f3a21cf5f183f.tar.xz
nixlib-ba186ec4b9a8fc8e86f8e6851f5f3a21cf5f183f.tar.zst
nixlib-ba186ec4b9a8fc8e86f8e6851f5f3a21cf5f183f.zip
mesos service: only pass --zk if quorum > 0
The ZooKeeper URL is not necessary when using in-memory slave
registration.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/misc/mesos-master.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix
index 11e21c334472..52f08c53b1dc 100644
--- a/nixos/modules/services/misc/mesos-master.nix
+++ b/nixos/modules/services/misc/mesos-master.nix
@@ -85,8 +85,9 @@ in {
         ExecStart = ''
           ${pkgs.mesos}/bin/mesos-master \
             --port=${toString cfg.port} \
-            --zk=${cfg.zk} \
-            ${if cfg.quorum == 0 then "--registry=in_memory" else "--registry=replicated_log --quorum=${toString cfg.quorum}"} \
+            ${if cfg.quorum == 0
+              then "--registry=in_memory"
+              else "--zk=${cfg.zk} --registry=replicated_log --quorum=${toString cfg.quorum}"} \
             --work_dir=${cfg.workDir} \
             --logging_level=${cfg.logLevel} \
             ${toString cfg.extraCmdLineOptions}