diff options
| author | Daniel Kuehn <daniel@kuehn.se> | 2019-10-27 16:56:52 +0100 |
|---|---|---|
| committer | Daniel Kuehn <daniel@kuehn.se> | 2019-10-27 16:56:52 +0100 |
| commit | db0787c87aeecb9004fbab6323b222e98ecc1666 (patch) | |
| tree | 44165ae516f370b4d6a99d94fc315f4342e39125 /nixos/tests/ceph-multi-node.nix | |
| parent | 916520151e495fae53c467c8667cecf8a3570f0c (diff) | |
nixos/ceph: Reduce RAM allocation for the test machines and change the sharing of the admin keyring to the shared directory instead of netcat
Diffstat (limited to 'nixos/tests/ceph-multi-node.nix')
| -rw-r--r-- | nixos/tests/ceph-multi-node.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix index a42d2b87c4a4..82cf5728e0ce 100644 --- a/nixos/tests/ceph-multi-node.nix +++ b/nixos/tests/ceph-multi-node.nix @@ -12,7 +12,7 @@ let generateHost = { pkgs, cephConfig, networkConfig, ... }: { virtualisation = { - memorySize = 1536; + memorySize = 512; emptyDiskImages = [ 20480 ]; vlans = [ 1 ]; }; @@ -153,14 +153,9 @@ in { $monA->waitUntilSucceeds("ceph -s | grep 'mgr: a(active,'"); # Send the admin keyring to the OSD machines - $osd0->mustSucceed("nc -vlkN 6800 > /etc/ceph/ceph.client.admin.keyring &"); - $osd1->mustSucceed("nc -vlkN 6800 > /etc/ceph/ceph.client.admin.keyring &"); - $osd0->waitForOpenPort("6800"); - $osd1->waitForOpenPort("6800"); - $monA->mustSucceed( - "nc 192.168.1.2 6800 < /etc/ceph/ceph.client.admin.keyring", - "nc 192.168.1.3 6800 < /etc/ceph/ceph.client.admin.keyring" - ); + $monA->mustSucceed("cp /etc/ceph/ceph.client.admin.keyring /tmp/shared"); + $osd0->mustSucceed("cp /tmp/shared/ceph.client.admin.keyring /etc/ceph"); + $osd1->mustSucceed("cp /tmp/shared/ceph.client.admin.keyring /etc/ceph"); # Bootstrap both OSDs $osd0->mustSucceed( |