Merge branch 'ceph-tests' of https://github.com/lejonet/nixpkgs into ceph-tests

1 files changed, 80 insertions, 59 deletions

diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix
index 82cf5728e0c..6698aac3f27 100644
--- a/nixos/tests/ceph-multi-node.nix
+++ b/nixos/tests/ceph-multi-node.nix
@@ -1,12 +1,31 @@
 import ./make-test.nix ({pkgs, lib, ...}:
 
 let
+  cfg = {
+    clusterId = "066ae264-2a5d-4729-8001-6ad265f50b03";
+    monA = {
+      name = "a";
+      ip = "192.168.1.1";
+    };
+    osd0 = {
+      name = "0";
+      ip = "192.168.1.2";
+      key = "AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==";
+      uuid = "55ba2294-3e24-478f-bee0-9dca4c231dd9";
+    };
+    osd1 = {
+      name = "1";
+      ip = "192.168.1.3";
+      key = "AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==";
+      uuid = "5e97a838-85b6-43b0-8950-cb56d554d1e5";
+    };
+  };
   generateCephConfig = { daemonConfig }: {
     enable = true;
     global = {
-      fsid = "066ae264-2a5d-4729-8001-6ad265f50b03";
-      monInitialMembers = "a";
-      monHost = "192.168.1.1";
+      fsid = cfg.clusterId;
+      monHost = cfg.monA.ip;
+      monInitialMembers = cfg.monA.name;
     };
   } // daemonConfig;
 
@@ -38,7 +57,7 @@ let
   networkMonA = {
     dhcpcd.enable = false;
     interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
-      { address = "192.168.1.1"; prefixLength = 24; }
+      { address = cfg.monA.ip; prefixLength = 24; }
     ];
     firewall = {
       allowedTCPPorts = [ 6789 3300 ];
@@ -48,18 +67,18 @@ let
   cephConfigMonA = generateCephConfig { daemonConfig = {
     mon = {
       enable = true;
-      daemons = [ "a" ];
+      daemons = [ cfg.monA.name ];
     };
     mgr = {
       enable = true;
-      daemons = [ "a" ];
+      daemons = [ cfg.monA.name ];
     };
   }; };
 
   networkOsd0 = {
     dhcpcd.enable = false;
     interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
-      { address = "192.168.1.2"; prefixLength = 24; }
+      { address = cfg.osd0.ip; prefixLength = 24; }
     ];
     firewall = {
       allowedTCPPortRanges = [ { from = 6800; to = 7300; } ];
@@ -68,14 +87,14 @@ let
   cephConfigOsd0 = generateCephConfig { daemonConfig = {
     osd = {
       enable = true;
-      daemons = [ "0" ];
+      daemons = [ cfg.osd0.name ];
     };
   }; };
 
   networkOsd1 = {
     dhcpcd.enable = false;
     interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
-      { address = "192.168.1.3"; prefixLength = 24; }
+      { address = cfg.osd1.ip; prefixLength = 24; }
     ];
     firewall = {
       allowedTCPPortRanges = [ { from = 6800; to = 7300; } ];
@@ -84,22 +103,11 @@ let
   cephConfigOsd1 = generateCephConfig { daemonConfig = {
     osd = {
       enable = true;
-      daemons = [ "1" ];
+      daemons = [ cfg.osd1.name ];
     };
   }; };
-in {
-  name = "basic-multi-node-ceph-cluster";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ lejonet ];
-  };
-
-  nodes = {
-    monA = generateHost { pkgs = pkgs; cephConfig = cephConfigMonA; networkConfig = networkMonA; };
-    osd0 = generateHost { pkgs = pkgs; cephConfig = cephConfigOsd0; networkConfig = networkOsd0; };
-    osd1 = generateHost { pkgs = pkgs; cephConfig = cephConfigOsd1; networkConfig = networkOsd1; };
-  };
 
-  testScript = { ... }: ''
+  testscript = { ... }: ''
     startAll;
 
     $monA->waitForUnit("network.target");
@@ -108,20 +116,20 @@ in {
 
     # Create the ceph-related directories
     $monA->mustSucceed(
-      "mkdir -p /var/lib/ceph/mgr/ceph-a",
-      "mkdir -p /var/lib/ceph/mon/ceph-a",
+      "mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}",
+      "mkdir -p /var/lib/ceph/mon/ceph-${cfg.monA.name}",
       "chown ceph:ceph -R /var/lib/ceph/",
       "mkdir -p /etc/ceph",
       "chown ceph:ceph -R /etc/ceph"
     );
     $osd0->mustSucceed(
-      "mkdir -p /var/lib/ceph/osd/ceph-0",
+      "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
       "chown ceph:ceph -R /var/lib/ceph/",
       "mkdir -p /etc/ceph",
       "chown ceph:ceph -R /etc/ceph"
     );
     $osd1->mustSucceed(
-      "mkdir -p /var/lib/ceph/osd/ceph-1",
+      "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
       "chown ceph:ceph -R /var/lib/ceph/",
       "mkdir -p /etc/ceph",
       "chown ceph:ceph -R /etc/ceph"
@@ -132,12 +140,12 @@ in {
       "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'",
       "sudo -u ceph ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'",
       "sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring",
-      "monmaptool --create --add a 192.168.1.1 --fsid 066ae264-2a5d-4729-8001-6ad265f50b03 /tmp/monmap",
-      "sudo -u ceph ceph-mon --mkfs -i a --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring",
-      "sudo -u ceph touch /var/lib/ceph/mon/ceph-a/done",
-      "systemctl start ceph-mon-a"
+      "monmaptool --create --add ${cfg.monA.name} ${cfg.monA.ip} --fsid ${cfg.clusterId} /tmp/monmap",
+      "sudo -u ceph ceph-mon --mkfs -i ${cfg.monA.name} --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring",
+      "sudo -u ceph touch /var/lib/ceph/mon/ceph-${cfg.monA.name}/done",
+      "systemctl start ceph-mon-${cfg.monA.name}"
     );
-    $monA->waitForUnit("ceph-mon-a");
+    $monA->waitForUnit("ceph-mon-${cfg.monA.name}");
     $monA->mustSucceed("ceph mon enable-msgr2");
 
     # Can't check ceph status until a mon is up
@@ -145,12 +153,12 @@ in {
 
     # Start the ceph-mgr daemon, it has no deps and hardly any setup
     $monA->mustSucceed(
-      "ceph auth get-or-create mgr.a mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-a/keyring",
-      "systemctl start ceph-mgr-a"
+      "ceph auth get-or-create mgr.${cfg.monA.name} mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-${cfg.monA.name}/keyring",
+      "systemctl start ceph-mgr-${cfg.monA.name}"
     );
     $monA->waitForUnit("ceph-mgr-a");
-    $monA->waitUntilSucceeds("ceph -s | grep 'quorum a'");
-    $monA->waitUntilSucceeds("ceph -s | grep 'mgr: a(active,'");
+    $monA->waitUntilSucceeds("ceph -s | grep 'quorum ${cfg.monA.name}'");
+    $monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
 
     # Send the admin keyring to the OSD machines
     $monA->mustSucceed("cp /etc/ceph/ceph.client.admin.keyring /tmp/shared");
@@ -160,40 +168,40 @@ in {
     # Bootstrap both OSDs
     $osd0->mustSucceed(
       "mkfs.xfs /dev/vdb",
-      "mount /dev/vdb /var/lib/ceph/osd/ceph-0",
-      "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-0/keyring --name osd.0 --add-key AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==",
-      "echo '{\"cephx_secret\": \"AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==\"}' | ceph osd new 55ba2294-3e24-478f-bee0-9dca4c231dd9 -i -",
+      "mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd0.name}",
+      "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd0.name}/keyring --name osd.${cfg.osd0.name} --add-key ${cfg.osd0.key}",
+      "echo '{\"cephx_secret\": \"${cfg.osd0.key}\"}' | ceph osd new ${cfg.osd0.uuid} -i -",
     );
     $osd1->mustSucceed(
       "mkfs.xfs /dev/vdb",
-      "mount /dev/vdb /var/lib/ceph/osd/ceph-1",
-      "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-1/keyring --name osd.1 --add-key AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==",
-      "echo '{\"cephx_secret\": \"AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==\"}' | ceph osd new 5e97a838-85b6-43b0-8950-cb56d554d1e5 -i -"
+      "mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd1.name}",
+      "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd1.name}/keyring --name osd.${cfg.osd1.name} --add-key ${cfg.osd1.key}",
+      "echo '{\"cephx_secret\": \"${cfg.osd1.key}\"}' | ceph osd new ${cfg.osd1.uuid} -i -"
     );
 
     # Initialize the OSDs with regular filestore
     $osd0->mustSucceed(
-      "ceph-osd -i 0 --mkfs --osd-uuid 55ba2294-3e24-478f-bee0-9dca4c231dd9",
+      "ceph-osd -i ${cfg.osd0.name} --mkfs --osd-uuid ${cfg.osd0.uuid}",
       "chown -R ceph:ceph /var/lib/ceph/osd",
-      "systemctl start ceph-osd-0",
+      "systemctl start ceph-osd-${cfg.osd0.name}",
     );
     $osd1->mustSucceed(
-      "ceph-osd -i 1 --mkfs --osd-uuid 5e97a838-85b6-43b0-8950-cb56d554d1e5",
+      "ceph-osd -i ${cfg.osd1.name} --mkfs --osd-uuid ${cfg.osd1.uuid}",
       "chown -R ceph:ceph /var/lib/ceph/osd",
-      "systemctl start ceph-osd-1"
+      "systemctl start ceph-osd-${cfg.osd1.name}"
     );
     $monA->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
-    $monA->waitUntilSucceeds("ceph -s | grep 'mgr: a(active,'");
+    $monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
     $monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
 
     $monA->mustSucceed(
       "ceph osd pool create multi-node-test 100 100",
       "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'",
-      "ceph -s | grep '1 pools, 100 pgs'",
-      "ceph osd pool set multi-node-other-test size 2"
+      "ceph osd pool ls | grep 'multi-node-other-test'"
     );
+    $monA->waitUntilSucceeds("ceph -s | grep '1 pools, 100 pgs'");
+    $monA->mustSucceed("ceph osd pool set multi-node-other-test size 2");
     $monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
     $monA->waitUntilSucceeds("ceph -s | grep '100 active+clean'");
     $monA->mustFail(
@@ -202,25 +210,38 @@ in {
     );
 
     # As we disable the target in the config, we still want to test that it works as intended
-    $osd0->mustSucceed("systemctl stop ceph-osd-0");
-    $osd1->mustSucceed("systemctl stop ceph-osd-1");
+    $osd0->mustSucceed("systemctl stop ceph-osd-${cfg.osd0.name}");
+    $osd1->mustSucceed("systemctl stop ceph-osd-${cfg.osd1.name}");
     $monA->mustSucceed(
-      "systemctl stop ceph-mgr-a",
-      "systemctl stop ceph-mon-a"
+      "systemctl stop ceph-mgr-${cfg.monA.name}",
+      "systemctl stop ceph-mon-${cfg.monA.name}"
     );
     
     $monA->succeed("systemctl start ceph.target");
-    $monA->waitForUnit("ceph-mon-a");
-    $monA->waitForUnit("ceph-mgr-a");
+    $monA->waitForUnit("ceph-mon-${cfg.monA.name}");
+    $monA->waitForUnit("ceph-mgr-${cfg.monA.name}");
     $osd0->succeed("systemctl start ceph.target");
-    $osd0->waitForUnit("ceph-osd-0");
+    $osd0->waitForUnit("ceph-osd-${cfg.osd0.name}");
     $osd1->succeed("systemctl start ceph.target");
-    $osd1->waitForUnit("ceph-osd-1");
+    $osd1->waitForUnit("ceph-osd-${cfg.osd1.name}");
     
     $monA->succeed("ceph -s | grep 'mon: 1 daemons'");
-    $monA->waitUntilSucceeds("ceph -s | grep 'quorum a'");
+    $monA->waitUntilSucceeds("ceph -s | grep 'quorum ${cfg.monA.name}'");
     $monA->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'");
-    $monA->waitUntilSucceeds("ceph -s | grep 'mgr: a(active,'");
+    $monA->waitUntilSucceeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'");
     $monA->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'");
   '';
+in {
+  name = "basic-multi-node-ceph-cluster";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ lejonet ];
+  };
+
+  nodes = {
+    monA = generateHost { pkgs = pkgs; cephConfig = cephConfigMonA; networkConfig = networkMonA; };
+    osd0 = generateHost { pkgs = pkgs; cephConfig = cephConfigOsd0; networkConfig = networkOsd0; };
+    osd1 = generateHost { pkgs = pkgs; cephConfig = cephConfigOsd1; networkConfig = networkOsd1; };
+  };
+
+  testScript = testscript;
 })