diff options
Diffstat (limited to 'nixpkgs/nixos/tests/etcd-cluster.nix')
| -rw-r--r-- | nixpkgs/nixos/tests/etcd-cluster.nix | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/nixpkgs/nixos/tests/etcd-cluster.nix b/nixpkgs/nixos/tests/etcd-cluster.nix index 410cb654794f..c77c0dd73c25 100644 --- a/nixpkgs/nixos/tests/etcd-cluster.nix +++ b/nixpkgs/nixos/tests/etcd-cluster.nix @@ -53,7 +53,7 @@ import ./make-test-python.nix ({ pkgs, ... } : let [ v3_req ] basicConstraints = CA:FALSE keyUsage = digitalSignature, keyEncipherment - extendedKeyUsage = serverAuth + extendedKeyUsage = serverAuth, clientAuth subjectAltName = @alt_names [alt_names] DNS.1 = node1 @@ -79,23 +79,26 @@ import ./make-test-python.nix ({ pkgs, ... } : let keyFile = etcd_key; certFile = etcd_cert; trustedCaFile = ca_pem; - peerClientCertAuth = true; + clientCertAuth = true; listenClientUrls = ["https://127.0.0.1:2379"]; listenPeerUrls = ["https://0.0.0.0:2380"]; }; }; environment.variables = { - ETCDCTL_CERT_FILE = "${etcd_client_cert}"; - ETCDCTL_KEY_FILE = "${etcd_client_key}"; - ETCDCTL_CA_FILE = "${ca_pem}"; - ETCDCTL_PEERS = "https://127.0.0.1:2379"; + ETCD_CERT_FILE = "${etcd_client_cert}"; + ETCD_KEY_FILE = "${etcd_client_key}"; + ETCD_CA_FILE = "${ca_pem}"; + ETCDCTL_ENDPOINTS = "https://127.0.0.1:2379"; + ETCDCTL_CACERT = "${ca_pem}"; + ETCDCTL_CERT = "${etcd_cert}"; + ETCDCTL_KEY = "${etcd_key}"; }; networking.firewall.allowedTCPPorts = [ 2380 ]; }; in { - name = "etcd"; + name = "etcd-cluster"; meta = with pkgs.lib.maintainers; { maintainers = [ offline ]; @@ -134,21 +137,21 @@ in { node2.start() node1.wait_for_unit("etcd.service") node2.wait_for_unit("etcd.service") - node2.wait_until_succeeds("etcdctl cluster-health") - node1.succeed("etcdctl set /foo/bar 'Hello world'") + node2.wait_until_succeeds("etcdctl endpoint status") + node1.succeed("etcdctl put /foo/bar 'Hello world'") node2.succeed("etcdctl get /foo/bar | grep 'Hello world'") with subtest("should add another member"): - node1.wait_until_succeeds("etcdctl member add node3 https://node3:2380") + node1.wait_until_succeeds("etcdctl member add node3 --peer-urls=https://node3:2380") node3.start() node3.wait_for_unit("etcd.service") node3.wait_until_succeeds("etcdctl member list | grep 'node3'") - node3.succeed("etcdctl cluster-health") + node3.succeed("etcdctl endpoint status") with subtest("should survive member crash"): node3.crash() - node1.succeed("etcdctl cluster-health") - node1.succeed("etcdctl set /foo/bar 'Hello degraded world'") + node1.succeed("etcdctl endpoint status") + node1.succeed("etcdctl put /foo/bar 'Hello degraded world'") node1.succeed("etcdctl get /foo/bar | grep 'Hello degraded world'") ''; }) |