yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'inventory: Add buildHost argument' (#3817) from Qubasa/clan-core:minimized into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3817
This commit is contained in:
Luis Hebendanz
2025-06-02 15:07:38 +00:00
parent 899514cfe7 ae41bfad8c
commit b0c7b5cc38
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/inventory/build-inventory/builder/default.nix
View File

@@ -50,7 +50,10 @@ let
{
machineImports = [
(lib.optionalAttrs (machineConfig.deploy.targetHost or null != null) {
config.clan.core.networking.targetHost = machineConfig.deploy.targetHost;
config.clan.core.networking.targetHost = lib.mkForce machineConfig.deploy.targetHost;
})
(lib.optionalAttrs (machineConfig.deploy.buildHost or null != null) {
config.clan.core.networking.buildHost = lib.mkForce machineConfig.deploy.buildHost;
})
];
assertions = { };

7
lib/inventory/build-inventory/interface.nix
View File

@@ -347,7 +347,12 @@ in
type = types.listOf types.str;
};
deploy.targetHost = lib.mkOption {
description = "Configuration for the deployment of the machine";
description = "SSH address of the host to deploy the machine to";
default = null;
type = types.nullOr types.str;
};
deploy.buildHost = lib.mkOption {
description = "SSH address of the host to build the machine on";
default = null;
type = types.nullOr types.str;
};

2
pkgs/clan-cli/clan_lib/nix_models/clan.py
View File

@@ -58,9 +58,11 @@ class InventoryInstance(TypedDict):
InventoryMachineDeployBuildhostType = str | None
InventoryMachineDeployTargethostType = str | None
class InventoryMachineDeploy(TypedDict):
buildHost: NotRequired[InventoryMachineDeployBuildhostType]
targetHost: NotRequired[InventoryMachineDeployTargethostType]

2
pkgs/clan-cli/clan_lib/nix_models/inventory.py
View File

@@ -58,9 +58,11 @@ class Instance(TypedDict):
MachineDeployBuildhostType = str
MachineDeployTargethostType = str
class MachineDeploy(TypedDict):
buildHost: NotRequired[MachineDeployBuildhostType]
targetHost: NotRequired[MachineDeployTargethostType]