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

drop "system" argument from inventory

Browse Source
This commit is contained in:
Jörg Thalheim
2024-09-29 18:49:32 +02:00
parent c620ee9d90
commit 9cdd55acf4
4 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
inventory.json
View File

@@ -12,8 +12,7 @@
}, },
"description": "A nice thing", "description": "A nice thing",
"icon": "./path/to/icon.png", "icon": "./path/to/icon.png",
"tags": ["1", "2", "3"], "tags": ["1", "2", "3"]
"system": "x86_64-linux"
} }
}, },
"services": { "services": {

3
lib/inventory/build-inventory/default.nix
View File

@@ -154,9 +154,6 @@ let
) [ ] inventory.services ) [ ] inventory.services
# Append each machine config # Append each machine config
++ [ ++ [
(lib.optionalAttrs (machineConfig.system or null != null) {
config.nixpkgs.hostPlatform = machineConfig.system;
})
(lib.optionalAttrs (machineConfig.deploy.targetHost or null != null) { (lib.optionalAttrs (machineConfig.deploy.targetHost or null != null) {
config.clan.core.networking.targetHost = machineConfig.deploy.targetHost; config.clan.core.networking.targetHost = machineConfig.deploy.targetHost;
}) })

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

@@ -142,10 +142,6 @@ in
apply = lib.unique; apply = lib.unique;
type = types.listOf types.str; type = types.listOf types.str;
}; };
system = lib.mkOption {
default = null;
type = types.nullOr types.str;
};
deploy.targetHost = lib.mkOption { deploy.targetHost = lib.mkOption {
description = "Configuration for the deployment of the machine"; description = "Configuration for the deployment of the machine";
default = null; default = null;

4
pkgs/clan-cli/tests/test_modules.py
View File

@@ -55,9 +55,7 @@ def test_add_module_to_inventory(
) )
opts = CreateOptions( opts = CreateOptions(
clan_dir=FlakeId(str(base_path)), clan_dir=FlakeId(str(base_path)),
machine=Machine( machine=Machine(name="machine1", tags=[], deploy=MachineDeploy()),
name="machine1", tags=[], system="x86_64-linux", deploy=MachineDeploy()
),
) )
create_machine(opts) create_machine(opts)