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

add support for build machines

Browse Source
This commit is contained in:
Jörg Thalheim
2024-02-06 16:11:55 +01:00
parent 5e5077c31c
commit 8f74f257e7
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/clan-cli/clan_cli/machines/update.py
View File

@@ -110,11 +110,6 @@ def deploy_nixos(hosts: HostGroup) -> None:
generate_secrets(machine)
upload_secrets(machine)
target_host = h.meta.get("target_host")
if target_host:
target_user = h.meta.get("target_user")
if target_user:
target_host = f"{target_user}@{target_host}"
extra_args = h.meta.get("extra_args", [])
cmd = [
"nixos-rebuild",
@@ -132,7 +127,8 @@ def deploy_nixos(hosts: HostGroup) -> None:
"--flake",
f"{path}#{machine.name}",
]
if target_host:
if target_host := h.meta.get("target_host"):
target_host = f"{target_host.user or 'root'}@{target_host.host}"
cmd.extend(["--target-host", target_host])
ret = h.run(cmd, check=False)
# re-retry switch if the first time fails
@@ -157,16 +153,10 @@ def get_all_machines(clan_dir: Path) -> HostGroup:
for name, machine_data in machines.items():
machine = Machine(name=name, flake=clan_dir, deployment_info=machine_data)
try:
machine.target_host_address
hosts.append(machine.build_host)
except ClanError:
ignored_machines.append(name)
continue
host = parse_deployment_address(
name,
host=machine.target_host_address,
meta={"machine": machine},
)
hosts.append(host)
if not hosts and ignored_machines != []:
print(
"WARNING: No machines to update. The following defined machines were ignored because they do not have `clan.networking.targetHost` nixos option set:",
@@ -182,7 +172,7 @@ def get_selected_machines(machine_names: list[str], flake_dir: Path) -> HostGrou
hosts = []
for name in machine_names:
machine = Machine(name=name, flake=flake_dir)
hosts.append(machine.target_host)
hosts.append(machine.build_host)
return HostGroup(hosts)