From f795df26cfd0cb746be89f9e004a25d85e0d8465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Thu, 18 Jun 2020 01:45:11 +0200 Subject: [PATCH] consul.passthru.tests: Refactor: Extract variable --- nixos/tests/consul.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/consul.nix b/nixos/tests/consul.nix index 6600dae4770b..785963d1a7cc 100644 --- a/nixos/tests/consul.nix +++ b/nixos/tests/consul.nix @@ -66,6 +66,7 @@ let services.consul = let thisConsensusServerHost = builtins.elemAt allConsensusServerHosts index; + numConsensusServers = builtins.length allConsensusServerHosts; in assert builtins.elem thisConsensusServerHost allConsensusServerHosts; { @@ -73,12 +74,12 @@ let inherit webUi; extraConfig = defaultExtraConfig // { server = true; - bootstrap_expect = builtins.length allConsensusServerHosts; + bootstrap_expect = numConsensusServers; retry_join = # If there's only 1 node in the network, we allow self-join; # otherwise, the node must not try to join itself, and join only the other servers. # See https://github.com/hashicorp/consul/issues/2868 - if builtins.length allConsensusServerHosts == 1 + if numConsensusServers == 1 then allConsensusServerHosts else builtins.filter (h: h != thisConsensusServerHost) allConsensusServerHosts; bind_addr = ip;