Stop using make-grid for testing deployment

morph/grid/testing/grid.nix

 # See morph/grid/local/grid.nix for additional commentary.
-let lib = import ../../lib;
-in lib.make-grid {
-  name = "Testing";
-  config = ./config.json;
-  nodes = cfg:
 let
+  pkgs = import <nixpkgs> { };
+
+  lib = import ../../lib;
+  config = pkgs.lib.trivial.importJSON ./config.json;
   sshUsers = import ./secrets/users.nix;
 
   # Get absolute vpn key directory path, as a string:
-    monitoringvpnKeyDir = toString ./. + "/${cfg.monitoringvpnKeyDir}";
+  monitoringvpnKeyDir = toString ./. + "/${config.monitoringvpnKeyDir}";
 
-    # TBD: derive these automatically:
-    hostsMap = {
-      "172.23.23.1"  = [ "monitoring" "monitoring.monitoringvpn" ];
-      "172.23.23.11" = [ "payments"   "payments.monitoringvpn"   ];
-      "172.23.23.12" = [ "storage001" "storage001.monitoringvpn" ];
-    };
-    vpnClientIPs = [ "172.23.23.11" "172.23.23.12" ];
-    nodeExporterTargets = [ "monitoring" "payments" "storage001" ];
-
-  in {
   payments = {
     imports = [
       lib.issuer
       lib.hardware-aws
-        (lib.customize-issuer cfg sshUsers monitoringvpnKeyDir "172.23.23.11" "19.03")
+      (lib.customize-issuer config sshUsers monitoringvpnKeyDir "172.23.23.11" "19.03")
     ];
   };
 
@@ -32,7 +21,7 @@ in lib.make-grid {
     imports = [
       lib.storage
       ./testing001-hardware.nix
-        (lib.customize-storage cfg sshUsers publicIPv4 monitoringvpnKeyDir "172.23.23.12" "19.03")
+      (lib.customize-storage config sshUsers publicIPv4 monitoringvpnKeyDir "172.23.23.12" "19.03")
     ];
   };
 
@@ -43,5 +32,19 @@ in lib.make-grid {
       (lib.customize-monitoring hostsMap monitoringvpnKeyDir publicIPv4 "172.23.23.1" vpnClientIPs nodeExporterTargets [] "19.09")
     ];
   };
+
+  # TBD: derive these automatically:
+  hostsMap = {
+    "172.23.23.1"  = [ "monitoring" "monitoring.monitoringvpn" ];
+    "172.23.23.11" = [ "payments"   "payments.monitoringvpn"   ];
+    "172.23.23.12" = [ "storage001" "storage001.monitoringvpn" ];
+  };
+  vpnClientIPs = [ "172.23.23.11" "172.23.23.12" ];
+  nodeExporterTargets = [ "monitoring" "payments" "storage001" ];
+
+in {
+  network = {
+    description = "PrivateStorage.io Testing Grid";
   };
+  inherit payments monitoring storage001;
 }