From 41141c04835afcab81baba5b8ff0aa8b74281f96 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Mon, 26 Aug 2024 18:00:41 +0200 Subject: [PATCH 1/2] API: fix online check --- pkgs/clan-cli/clan_cli/machines/list.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/machines/list.py b/pkgs/clan-cli/clan_cli/machines/list.py index 0ebe9ec5b..0c0ce719a 100644 --- a/pkgs/clan-cli/clan_cli/machines/list.py +++ b/pkgs/clan-cli/clan_cli/machines/list.py @@ -103,10 +103,13 @@ def check_machine_online( "ssh", *(["-i", f"{opts.keyfile}"] if opts and opts.keyfile else []), # Disable strict host key checking - "-o StrictHostKeyChecking=no", + "-o", + "StrictHostKeyChecking=no", # Disable known hosts file - "-o UserKnownHostsFile=/dev/null", - f"-o ConnectTimeout={timeout}", + "-o", + "UserKnownHostsFile=/dev/null", + "-o", + f"ConnectTimeout={timeout}", f"{hostname}", "true", "&> /dev/null", From da9af768c2197ed2d417bdecf242063e779b9c9a Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Mon, 26 Aug 2024 18:03:35 +0200 Subject: [PATCH 2/2] API: fix single disk service --- pkgs/clan-cli/clan_cli/api/disk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/clan-cli/clan_cli/api/disk.py b/pkgs/clan-cli/clan_cli/api/disk.py index 63b50f846..193436100 100644 --- a/pkgs/clan-cli/clan_cli/api/disk.py +++ b/pkgs/clan-cli/clan_cli/api/disk.py @@ -32,7 +32,8 @@ def set_single_disk_uuid( meta=ServiceMeta(name=instance_name), roles=ServiceSingleDiskRole( default=ServiceSingleDiskRoleDefault( - config=SingleDiskConfig(device=disk_uuid) + config=SingleDiskConfig(device=f"/dev/disk/by-id/{disk_uuid}"), + machines=[machine_name], ) ), )