Compare commits

..

4 commits

Author SHA1 Message Date
147171a183
restore disk size
Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
2025-10-22 14:28:29 +02:00
db0d0a90d4
add fixme
Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
2025-10-22 14:23:45 +02:00
e8158b0e6d
mv disko
Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
2025-10-22 14:10:43 +02:00
b8c2250131
rm flake invocation
Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
2025-10-22 14:10:23 +02:00
4 changed files with 3 additions and 70 deletions

View file

@ -41,7 +41,7 @@ in
## Memory use is expected to be dominated by the NixOS evaluation,
## which happens on the deployer.
memorySize = 4 * 1024;
diskSize = 32 * 1024;
diskSize = 4 * 1024;
cores = 2;
};
@ -62,7 +62,6 @@ in
sources.nixpkgs
sources.flake-inputs
sources.git-hooks
sources.disko
pkgs.stdenv
pkgs.stdenvNoCC

View file

@ -16,7 +16,7 @@ in
imports = [
(modulesPath + "/profiles/qemu-guest.nix")
# FIXME uncomment this when using test over `nix run`
# FIXME needed for non-proxmox tests
# (modulesPath + "/../lib/testing/nixos-test-base.nix")
./sharedOptions.nix
];

View file

@ -142,6 +142,7 @@ in
];
};
system.extraDependencies = [
sources.disko
pkgs.ubootQemuX86
pkgs.ubootQemuX86.inputDerivation
pkgs.pve-qemu

View file

@ -52,73 +52,6 @@
trim-trailing-whitespace.enable = true;
shellcheck.enable = true;
};
# https://192.168.51.81:8006/#v1:0:=node%2Fnode051:4:::::8::=apitokens
# apps.default = {
# type = "app";
# program = pkgs.writers.writeBashBin "provision-proxmox.sh"
# {
# makeWrapperArgs = [
# "--prefix"
# "PATH"
# ":"
# "${lib.makeBinPath [
# pkgs.jq
# pkgs.httpie
# ]}"
# ];
# }
# ''
# sh ./infra/proxmox-remove.sh --api-url "https://192.168.51.81:8006/api2/json" --username "kiara@ProcoliX" --password "" 7014 # test14
# sh ./infra/proxmox-provision.sh --api-url "https://192.168.51.81:8006/api2/json" --username "kiara@ProcoliX" --password "" test14
# '';
# };
# api_token = "terraform@pve!provider=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
# kiara@ProcoliX!dsdfsfdsfd=30df234b-02f3-4ed9-b778-00d28ad3499c
apps.default =
let
inherit (pkgs) system;
# FIXME rewire to defer env var
deployment = pkgs.writeShellScriptBin "my-app-with-environment" ''
export PROXMOX_VE_SSH_USERNAME="kiara@ProcoliX"
export PROXMOX_VE_SSH_PASSWORD=""
${(import ./deployment/check/common/data-model.nix {
inherit system;
config = {
targetSystem = system;
nodeName = "192.168.51.81"; # root@fediversity-proxmox
pathToRoot = builtins.path {
path = ./.;
name = "root";
};
sshOpts = [ ];
key-file = "";
node-name = "node051";
bridge = "ovsbr0";
vlanId = 1305;
imageDatastoreId = "local";
vmDatastoreId = "linstor_storage";
cdDatastoreId = "local-lvm";
ipv4Gateway = "eth0";
ipv4Address = "";
# ipv4Address = "95.215.187.${vm-id}";
ipv6Gateway = "eth0";
ipv6Address = "";
# ipv6Address = "2a00:51c0:13:1305::${vm-id}";
};
# opt not to pass `inputs`, as we could only pass serializable arguments through to its self-call
})."tf-proxmox-deployment".tf-proxmox-vm
}
'';
in
{
type = "app";
program = deployment.run;
};
};
}
);