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

Merge pull request 'clan_cli: improve target_host handling for clan machines install' (#2626) from Enzime/clan-core:push-pplrtxtyoyks into main

Browse Source
This commit is contained in:
clan-bot
2024-12-17 13:52:43 +00:00
parent 65479b581f abd145aaaa
commit b1fcc72748
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/clan-cli/clan_cli/machines/install.py
View File

@@ -135,23 +135,24 @@ def install_command(args: argparse.Namespace) -> None:
msg = "Could not find clan flake toplevel directory"
raise ClanError(msg)
deploy_info: DeployInfo | None = ssh_command_parse(args)
password = None
if deploy_info:
if args.target_host:
target_host = args.target_host
elif deploy_info:
host = find_reachable_host(deploy_info)
if host is None:
msg = f"Couldn't reach any host address: {deploy_info.addrs}"
raise ClanError(msg)
target_host = host.target
password = deploy_info.pwd
elif args.target_host:
target_host = args.target_host
password = None
else:
machine = Machine(
name=args.machine, flake=args.flake, nix_options=args.option
)
target_host = str(machine.target_host)
password = None
target_host = machine.target_host.host
if deploy_info:
password = deploy_info.pwd
if args.password:
password = args.password