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

Merge pull request 'API: fixes' (#1977) from hsjobeki/clan-core:hsjobeki-main into main

Browse Source
This commit is contained in:
clan-bot
2024-08-26 16:08:39 +00:00
parent c8aa53a81e e17ef97c4a
commit d7c5deb5c3
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/clan-cli/clan_cli/api/disk.py
View File

@@ -32,7 +32,8 @@ def set_single_disk_uuid(
meta=ServiceMeta(name=instance_name), meta=ServiceMeta(name=instance_name),
roles=ServiceSingleDiskRole( roles=ServiceSingleDiskRole(
default=ServiceSingleDiskRoleDefault( default=ServiceSingleDiskRoleDefault(
config=SingleDiskConfig(device=disk_uuid) config=SingleDiskConfig(device=f"/dev/disk/by-id/{disk_uuid}"),
machines=[machine_name],
) )
), ),
) )

9
pkgs/clan-cli/clan_cli/machines/list.py
View File

@@ -103,10 +103,13 @@ def check_machine_online(
"ssh", "ssh",
*(["-i", f"{opts.keyfile}"] if opts and opts.keyfile else []), *(["-i", f"{opts.keyfile}"] if opts and opts.keyfile else []),
# Disable strict host key checking # Disable strict host key checking
"-o StrictHostKeyChecking=no", "-o",
"StrictHostKeyChecking=no",
# Disable known hosts file # Disable known hosts file
"-o UserKnownHostsFile=/dev/null", "-o",
f"-o ConnectTimeout={timeout}", "UserKnownHostsFile=/dev/null",
"-o",
f"ConnectTimeout={timeout}",
f"{hostname}", f"{hostname}",
"true", "true",
"&> /dev/null", "&> /dev/null",