privatevoid.net/depot
1
1
Fork 0
Code Issues 23 Pull requests 2 Projects 3 Releases Packages Wiki Activity Actions

checks: add generic consul module

Browse source
This commit is contained in:
Max Headroom 2023-09-03 03:15:45 +02:00
parent 48d635db6a
commit cfa64284fa
2 changed files with 32 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
packages/checks/ascensions.nix
View file

@ -1,4 +1,4 @@
{ nixosTest, nixosModules }: { testers, nixosModules }:
let let
dataDir = { dataDir = {
@ -9,24 +9,16 @@ let
node1 = "before"; node1 = "before";
node2 = "after"; node2 = "after";
}; };
addr = {
consul = "10.0.0.10";
node1 = "10.0.0.1";
node2 = "10.0.0.2";
};
in in
nixosTest { testers.runNixOSTest {
name = "ascensions"; name = "ascensions";
nodes = let
network = { config, lib, ... }: { imports = [
networking.interfaces.eth1.ipv4.addresses = lib.mkForce [ ./modules/consul.nix
{
address = addr.${config.networking.hostName};
prefixLength = 24;
}
]; ];
};
nodes = let
common = { config, lib, ... }: let common = { config, lib, ... }: let
inherit (config.networking) hostName; inherit (config.networking) hostName;
in { in {
@ -53,10 +45,10 @@ nixosTest {
consul kv put ${kvPath.${hostName}} ${hostName} consul kv put ${kvPath.${hostName}} ${hostName}
fi fi
''; '';
environment.CONSUL_HTTP_ADDR = "${addr.consul}:8500"; environment.CONSUL_HTTP_ADDR = "consul:8500";
}; };
ascend-create-kv = { ascend-create-kv = {
environment.CONSUL_HTTP_ADDR = "${addr.consul}:8500"; environment.CONSUL_HTTP_ADDR = "consul:8500";
}; };
}; };
system.ascensions = { system.ascensions = {
@ -79,26 +71,13 @@ nixosTest {
}; };
}; };
in { in {
consul = { node1.imports = [ common ];
imports = [ network ]; node2.imports = [ common ];
networking.firewall.allowedTCPPorts = [ 8500 ];
services.consul = {
enable = true;
extraConfig = {
addresses.http = addr.consul;
bind_addr = addr.consul;
server = true;
bootstrap_expect = 1;
};
};
};
node1.imports = [ network common ];
node2.imports = [ network common ];
}; };
testScript = /*python*/ '' testScript = /*python*/ ''
start_all() start_all()
consul.wait_for_unit("consul.service") consul.wait_for_unit("consul.service")
consul.wait_until_succeeds("CONSUL_HTTP_ADDR=${addr.consul}:8500 consul members") consul.wait_until_succeeds("CONSUL_HTTP_ADDR=consul:8500 consul members")
node1.wait_for_unit("multi-user.target") node1.wait_for_unit("multi-user.target")
node1.succeed("systemctl start create-file create-kv") node1.succeed("systemctl start create-file create-kv")
node1.succeed("tar cvf /tmp/shared/data.tar /data /var/lib/ascensions") node1.succeed("tar cvf /tmp/shared/data.tar /data /var/lib/ascensions")
@ -108,6 +87,6 @@ nixosTest {
node2.succeed("systemctl start create-file create-kv") node2.succeed("systemctl start create-file create-kv")
assert "node1" in node2.succeed("cat ${dataDir.node2}/file.txt") assert "node1" in node2.succeed("cat ${dataDir.node2}/file.txt")
assert "node1" in consul.succeed("CONSUL_HTTP_ADDR=${addr.consul}:8500 consul kv get ${kvPath.node2}") assert "node1" in consul.succeed("CONSUL_HTTP_ADDR=consul:8500 consul kv get ${kvPath.node2}")
''; '';
} }

19
packages/checks/modules/consul.nix Normal file
View file

@ -0,0 +1,19 @@
{ config, ... }:
{
extraBaseModules = {
services.consul.extraConfig.addresses.http = config.nodes.consul.networking.primaryIPAddress;
};
nodes.consul = { config, ... }: {
networking.firewall.allowedTCPPorts = [ 8500 ];
services.consul = {
enable = true;
extraConfig = {
bind_addr = config.networking.primaryIPAddress;
server = true;
bootstrap_expect = 1;
};
};
};
}