nixos/etcd: fix postStart check and make tests deterministic

1 files changed, 5 insertions, 2 deletions

diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix
index 550d351ccfbe..284361a04d9e 100644
--- a/nixos/modules/services/misc/etcd.nix
+++ b/nixos/modules/services/misc/etcd.nix
@@ -46,7 +46,7 @@ in {
 
     initialCluster = mkOption {
       description = "Etcd initial cluster configuration for bootstrapping.";
-      default = ["${cfg.name}=http://localhost:2380" "${cfg.name}=http://localhost:7001"];
+      default = ["${cfg.name}=http://localhost:7001"];
       type = types.listOf types.str;
     };
 
@@ -123,7 +123,10 @@ in {
         if [ "$(id -u)" = 0 ]; then chown etcd ${cfg.dataDir}; fi
       '';
       postStart = ''
-        until ${pkgs.curl}/bin/curl -s -o /dev/null '${head cfg.listenClientUrls}/version'; do
+        until ${pkgs.etcdctl}/bin/etcdctl set /nixos/state 'up'; do
+          sleep 1;
+        done
+        until ${pkgs.etcdctl}/bin/etcdctl get /nixos/state | grep up; do
           sleep 1;
         done
       '';