WIP: proxmox deployment

Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>

deployment/check/data-model-ssh/nixosTest.nix

@@ -40,9 +40,10 @@ in
   ];
 
   nodes.deployer =
-    { ... }:
+    { pkgs, ... }:
     {
-      environment.systemPackages = [
+      environment.systemPackages = with pkgs; [
+        jq
         deploy
       ];
 

deployment/check/data-model-tf-proxmox/nixosTest.nix

@@ -77,13 +77,16 @@ in
     };
 
   nodes.deployer =
-    { ... }:
+    { pkgs, ... }:
     {
       nix.nixPath = [
         (lib.concatStringsSep ":" (lib.mapAttrsToList (k: v: k + "=" + v) sources))
       ];
 
-      environment.systemPackages = [
+      environment.systemPackages = with pkgs; [
+        (pkgs.callPackage ../../run/tf-proxmox/tf.nix { inherit sources; })
+        jq
+        nixos-generators
         deployment.run
       ];
 

deployment/check/data-model-tf/nixosTest.nix

@@ -31,9 +31,11 @@ in
   ];
 
   nodes.deployer =
-    { ... }:
+    { pkgs, ... }:
     {
-      environment.systemPackages = [
+      environment.systemPackages = with pkgs; [
+        (pkgs.callPackage ../../run/tf-single-host/tf.nix { })
+        jq
         deploy
       ];
 
@@ -48,10 +50,10 @@ in
     };
 
   extraTestScript = ''
-    with subtest("Check the status before deployment"):
+    with subtest("ssh: Check the status before deployment"):
       target.fail("hello 1>&2")
 
-    with subtest("Run the deployment"):
+    with subtest("ssh: Run the deployment"):
       deployer.succeed("""
         ${lib.getExe deploy}
       """)

deployment/data-model.nix

@@ -3,7 +3,6 @@
   config,
   inputs,
   pkgs,
-  sources ? import ../npins,
   ...
 }:
 let
@@ -147,22 +146,11 @@ let
                   deployment_type = "ssh-host";
                 };
               in
-              pkgs.writers.writeBashBin "deploy-sh.sh"
+              pkgs.writeShellScriptBin "deploy-ssh.sh" ''
-                {
+                env ${
-                  makeWrapperArgs = [
+                  toString (lib.mapAttrsToList (k: v: "${k}=\"${toBash v}\"") environment)
-                    "--prefix"
+                } bash ./deployment/run/ssh-single-host/run.sh
-                    "PATH"
+              '';
-                    ":"
-                    "${lib.makeBinPath [
-                      pkgs.jq
-                    ]}"
-                  ];
-                }
-                ''
-                  env ${
-                    toString (lib.mapAttrsToList (k: v: "${k}=\"${toBash v}\"") environment)
-                  } bash ./deployment/run/ssh-single-host/run.sh
-                '';
           };
         };
       });
@@ -233,22 +221,10 @@ let
                 };
                 tf-env = pkgs.callPackage ./run/tf-single-host/tf-env.nix { };
               in
-              pkgs.writers.writeBashBin "deploy-tf.sh"
+              pkgs.writeShellScriptBin "deploy-ssh.sh" ''
-                {
+                env ${toString (lib.mapAttrsToList (k: v: "TF_VAR_${k}=\"${toBash v}\"") environment)} \
-                  makeWrapperArgs = [
+                tf_env=${tf-env} bash ./deployment/run/tf-single-host/run.sh
-                    "--prefix"
+              '';
-                    "PATH"
-                    ":"
-                    "${lib.makeBinPath [
-                      pkgs.jq
-                      (pkgs.callPackage ./run/tf-single-host/tf.nix { inherit sources; })
-                    ]}"
-                  ];
-                }
-                ''
-                  env ${toString (lib.mapAttrsToList (k: v: "TF_VAR_${k}=\"${toBash v}\"") environment)} \
-                  tf_env=${tf-env} bash ./deployment/run/tf-single-host/run.sh
-                '';
           };
         };
       });
@@ -316,23 +292,10 @@ let
                 };
                 tf-env = pkgs.callPackage ./run/tf-proxmox/tf-env.nix { };
               in
-              pkgs.writers.writeBashBin "deploy-tf-proxmox.sh"
+              pkgs.writeShellScriptBin "deploy-ssh.sh" ''
-                {
+                env ${toString (lib.mapAttrsToList (k: v: "TF_VAR_${k}=\"${toBash v}\"") environment)} \
-                  makeWrapperArgs = [
+                tf_env=${tf-env} bash ./deployment/run/tf-proxmox/run.sh
-                    "--prefix"
+              '';
-                    "PATH"
-                    ":"
-                    "${lib.makeBinPath [
-                      pkgs.jq
-                      pkgs.nixos-generators
-                      (pkgs.callPackage ./run/tf-proxmox/tf.nix { inherit sources; })
-                    ]}"
-                  ];
-                }
-                ''
-                  env ${toString (lib.mapAttrsToList (k: v: "TF_VAR_${k}=\"${toBash v}\"") environment)} \
-                  tf_env=${tf-env} bash ./deployment/run/tf-proxmox/run.sh
-                '';
           };
         };
       });