diff options
| author | Sarah Brofeldt <sbrofeldt@gmail.com> | 2020-04-06 07:44:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-06 07:44:02 +0200 |
| commit | b256b2253c7e915be607595cdddeba458dfe0a19 (patch) | |
| tree | 8f107079905bdd83a3e8fa0a85e064c4a934d43a /nixos | |
| parent | ce867da9973f147438b14fe15165a6a0e9697cb3 (diff) | |
| parent | 6ccd347e461015dc26222c832b87c3050558ba86 (diff) | |
| download | nixlib-b256b2253c7e915be607595cdddeba458dfe0a19.tar nixlib-b256b2253c7e915be607595cdddeba458dfe0a19.tar.gz nixlib-b256b2253c7e915be607595cdddeba458dfe0a19.tar.bz2 nixlib-b256b2253c7e915be607595cdddeba458dfe0a19.tar.lz nixlib-b256b2253c7e915be607595cdddeba458dfe0a19.tar.xz nixlib-b256b2253c7e915be607595cdddeba458dfe0a19.tar.zst nixlib-b256b2253c7e915be607595cdddeba458dfe0a19.zip | |
Merge pull request #83749 from srhb/ceph-14.2.8
ceph: 14.2.7 -> 14.2.8
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/ceph-multi-node.nix | 6 | ||||
| -rw-r--r-- | nixos/tests/ceph-single-node.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix index 90dd747525de..22fe5cada480 100644 --- a/nixos/tests/ceph-multi-node.nix +++ b/nixos/tests/ceph-multi-node.nix @@ -183,15 +183,15 @@ let monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") monA.succeed( - "ceph osd pool create multi-node-test 100 100", + "ceph osd pool create multi-node-test 128 128", "ceph osd pool ls | grep 'multi-node-test'", "ceph osd pool rename multi-node-test multi-node-other-test", "ceph osd pool ls | grep 'multi-node-other-test'", ) - monA.wait_until_succeeds("ceph -s | grep '1 pools, 100 pgs'") + monA.wait_until_succeeds("ceph -s | grep '1 pools, 128 pgs'") monA.succeed("ceph osd pool set multi-node-other-test size 2") monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") - monA.wait_until_succeeds("ceph -s | grep '100 active+clean'") + monA.wait_until_succeeds("ceph -s | grep '128 active+clean'") monA.fail( "ceph osd pool ls | grep 'multi-node-test'", "ceph osd pool delete multi-node-other-test multi-node-other-test --yes-i-really-really-mean-it", diff --git a/nixos/tests/ceph-single-node.nix b/nixos/tests/ceph-single-node.nix index 1a027e178367..01c4b4138451 100644 --- a/nixos/tests/ceph-single-node.nix +++ b/nixos/tests/ceph-single-node.nix @@ -143,12 +143,12 @@ let monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") monA.succeed( - "ceph osd pool create single-node-test 100 100", + "ceph osd pool create single-node-test 128 128", "ceph osd pool ls | grep 'single-node-test'", "ceph osd pool rename single-node-test single-node-other-test", "ceph osd pool ls | grep 'single-node-other-test'", ) - monA.wait_until_succeeds("ceph -s | grep '1 pools, 100 pgs'") + monA.wait_until_succeeds("ceph -s | grep '1 pools, 128 pgs'") monA.succeed( "ceph osd getcrushmap -o crush", "crushtool -d crush -o decrushed", @@ -158,7 +158,7 @@ let "ceph osd pool set single-node-other-test size 2", ) monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") - monA.wait_until_succeeds("ceph -s | grep '100 active+clean'") + monA.wait_until_succeeds("ceph -s | grep '128 active+clean'") monA.fail( "ceph osd pool ls | grep 'multi-node-test'", "ceph osd pool delete single-node-other-test single-node-other-test --yes-i-really-really-mean-it", |