JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/ceph: fix tests

Browse Source 
- 512 -> 1024MB vm memory (had sporadic oom-failures with the lower setting)

- set "auth_allow_insecure_global_id_reclaim=false" as described here: https://docs.ceph.com/en/latest/security/CVE-2021-20288/
This commit is contained in:
Johan Thomsen 2021-04-21 16:19:00 +02:00
parent c3bd75c752
commit 8a6e130c71
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/tests/ceph-multi-node.nix
View File

@ -37,7 +37,7 @@ let
generateHost = { pkgs, cephConfig, networkConfig, ... }: { generateHost = { pkgs, cephConfig, networkConfig, ... }: {
virtualisation = { virtualisation = {
memorySize = 512; memorySize = 1024;
emptyDiskImages = [ 20480 ]; emptyDiskImages = [ 20480 ];
vlans = [ 1 ]; vlans = [ 1 ];
}; };
@ -120,6 +120,7 @@ let
) )
monA.wait_for_unit("ceph-mon-${cfg.monA.name}") monA.wait_for_unit("ceph-mon-${cfg.monA.name}")
monA.succeed("ceph mon enable-msgr2") monA.succeed("ceph mon enable-msgr2")
monA.succeed("ceph config set mon auth_allow_insecure_global_id_reclaim false")
# Can't check ceph status until a mon is up # Can't check ceph status until a mon is up
monA.succeed("ceph -s | grep 'mon: 1 daemons'") monA.succeed("ceph -s | grep 'mon: 1 daemons'")

3
nixos/tests/ceph-single-node-bluestore.nix
View File

@ -34,7 +34,7 @@ let
generateHost = { pkgs, cephConfig, networkConfig, ... }: { generateHost = { pkgs, cephConfig, networkConfig, ... }: {
virtualisation = { virtualisation = {
memorySize = 512; memorySize = 1024;
emptyDiskImages = [ 20480 20480 20480 ]; emptyDiskImages = [ 20480 20480 20480 ];
vlans = [ 1 ]; vlans = [ 1 ];
}; };
@ -95,6 +95,7 @@ let
) )
monA.wait_for_unit("ceph-mon-${cfg.monA.name}") monA.wait_for_unit("ceph-mon-${cfg.monA.name}")
monA.succeed("ceph mon enable-msgr2") monA.succeed("ceph mon enable-msgr2")
monA.succeed("ceph config set mon auth_allow_insecure_global_id_reclaim false")
# Can't check ceph status until a mon is up # Can't check ceph status until a mon is up
monA.succeed("ceph -s | grep 'mon: 1 daemons'") monA.succeed("ceph -s | grep 'mon: 1 daemons'")

3
nixos/tests/ceph-single-node.nix
View File

@ -34,7 +34,7 @@ let
generateHost = { pkgs, cephConfig, networkConfig, ... }: { generateHost = { pkgs, cephConfig, networkConfig, ... }: {
virtualisation = { virtualisation = {
memorySize = 512; memorySize = 1024;
emptyDiskImages = [ 20480 20480 20480 ]; emptyDiskImages = [ 20480 20480 20480 ];
vlans = [ 1 ]; vlans = [ 1 ];
}; };
@ -95,6 +95,7 @@ let
) )
monA.wait_for_unit("ceph-mon-${cfg.monA.name}") monA.wait_for_unit("ceph-mon-${cfg.monA.name}")
monA.succeed("ceph mon enable-msgr2") monA.succeed("ceph mon enable-msgr2")
monA.succeed("ceph config set mon auth_allow_insecure_global_id_reclaim false")
# Can't check ceph status until a mon is up # Can't check ceph status until a mon is up
monA.succeed("ceph -s | grep 'mon: 1 daemons'") monA.succeed("ceph -s | grep 'mon: 1 daemons'")