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

Merge pull request 'pkgs/clan: Rename target_host_str' (#4010) from kenji/ke-iventory into main

Browse Source 
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4010
Reviewed-by: Luis Hebendanz <consulting@qube.email>
This commit is contained in:
Luis Hebendanz
2025-06-18 10:58:58 +00:00
parent d9f2c1681f c1a4de843a
commit 100e01b32c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/clan-cli/clan_lib/machines/machines.py
View File

@@ -266,28 +266,28 @@ def get_host(
name: str, flake: Flake, field: Literal["targetHost", "buildHost"]
) -> RemoteSource | None:
"""
Get the build host for a machine.
Get the build or target host for a machine.
"""
machine = Machine(name=name, flake=flake)
inv_machine = machine.get_inv_machine()
source: Literal["inventory", "nix_machine"] = "inventory"
target_host_str = inv_machine.get("deploy", {}).get(field)
host_str = inv_machine.get("deploy", {}).get(field)
if target_host_str is None:
if host_str is None:
machine.info(
f"'{field}' is not set in inventory, falling back to slow Nix config"
)
target_host_str = machine.eval_nix(f'config.clan.core.networking."{field}"')
host_str = machine.eval_nix(f'config.clan.core.networking."{field}"')
source = "nix_machine"
if not target_host_str:
if not host_str:
return None
return RemoteSource(
data=Remote.from_deployment_address(
machine_name=machine.name,
address=target_host_str,
address=host_str,
host_key_check=machine.host_key_check,
private_key=machine.private_key,
),