First steps towards the new testing storage node

Also some refactoring to make this easier in the future, steps towards
unifying production and testing definitions, and start of docs for the whole thing.

morph/README.rst

@@ -43,10 +43,17 @@ Each such file contains a minimal Nix expression supplying critical system confi
 "Critical" roughly corresponds to anything which must be specified to have a bootable system.
 These files are referenced by the corresponding ``<hostname>.nix`` files.
 
-<hostname>.nix
---------------
+Configuring New Storage Nodes
+-----------------------------
+
+Storage nodes are brought into the grid in a multi-step process.
+Here are the steps to configure a new node,
+starting from a minimal NixOS 19.03 or 19.09 installation.
+
+#. Copy ``/etc/nixos/hardware-configuration.nix`` to ``storageNNN-hardware.nix``.
+   In the case of an EC2 instance, copy ``/etc/nixos/configuration.nix`` instead.
+#. Create a ``storageNNN-config.nix`` containing further configuration for the new host.
+#. Add an entry for the new host to ``grid.nix`` referencing the new files.
 
-Each such file contains the parts of the system configuration that aren't *so* related to hardware.
-They are referenced from ``grid.nix``.
 
 .. _`morph`: https://github.com/DBCDK/morph

morph/testing000.nix → morph/make-testing.nix

-{ publicIPv4, publicStoragePort, ristrettoSigningKeyPath, ... }: rec {
+{ publicIPv4, hardware, publicStoragePort, ristrettoSigningKeyPath, ... }: rec {
 
   deployment = {
     secrets = {
@@ -17,7 +17,7 @@
   };
 
   imports = [
-    ./testing000-hardware.nix
+    hardware
     ../nixos/modules/private-storage.nix
   ];
 

morph/testing-grid.nix

@@ -10,8 +10,9 @@ import ./make-grid.nix {
       stateVersion = "19.03";
     } // cfg);
 
-    "3.120.26.190" = import ./testing000.nix (cfg // {
+    "3.120.26.190" = import ./make-testing.nix (cfg // {
       publicIPv4 = "3.120.26.190";
+      hardware = ./testing001-hardware.nix;
     });
   };
 }

morph/testing000-hardware.nix

-{
-  imports = [
-    <nixpkgs/nixos/modules/virtualisation/amazon-image.nix>
-  ];
-
-  config.ec2.hvm = true;
-}

morph/testing001-hardware.nix

+{
+  imports = [ <nixpkgs/nixos/modules/virtualisation/amazon-image.nix> ];
+  ec2.hvm = true;
+
+}