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

clan_cli: always use --target-host if specified for machines install

Browse Source
This commit is contained in:
Michael Hoang
2024-12-18 00:05:19 +11:00
parent 0ca2e7f728
commit abd145aaaa
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
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" msg = "Could not find clan flake toplevel directory"
raise ClanError(msg) raise ClanError(msg)
deploy_info: DeployInfo | None = ssh_command_parse(args) 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) host = find_reachable_host(deploy_info)
if host is None: if host is None:
msg = f"Couldn't reach any host address: {deploy_info.addrs}" msg = f"Couldn't reach any host address: {deploy_info.addrs}"
raise ClanError(msg) raise ClanError(msg)
target_host = host.target target_host = host.target
password = deploy_info.pwd
elif args.target_host:
target_host = args.target_host
password = None
else: else:
machine = Machine( machine = Machine(
name=args.machine, flake=args.flake, nix_options=args.option name=args.machine, flake=args.flake, nix_options=args.option
) )
target_host = machine.target_host.host target_host = machine.target_host.host
password = None
if deploy_info:
password = deploy_info.pwd
if args.password: if args.password:
password = args.password password = args.password