From 745af335ecec572dd48316208fe8b74b43200193 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 12 Nov 2024 16:04:59 +0100 Subject: [PATCH] cli machines update: run deploy directly if deploying single machine --- pkgs/clan-cli/clan_cli/machines/machine_group.py | 1 + pkgs/clan-cli/clan_cli/machines/update.py | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/clan-cli/clan_cli/machines/machine_group.py b/pkgs/clan-cli/clan_cli/machines/machine_group.py index 43853c019..9ce7c98fb 100644 --- a/pkgs/clan-cli/clan_cli/machines/machine_group.py +++ b/pkgs/clan-cli/clan_cli/machines/machine_group.py @@ -10,6 +10,7 @@ T = TypeVar("T") class MachineGroup: def __init__(self, machines: list[Machine]) -> None: + self.machines = machines self.group = HostGroup([m.target_host for m in machines]) def __repr__(self) -> str: diff --git a/pkgs/clan-cli/clan_cli/machines/update.py b/pkgs/clan-cli/clan_cli/machines/update.py index d7d4524f2..a3bd49bac 100644 --- a/pkgs/clan-cli/clan_cli/machines/update.py +++ b/pkgs/clan-cli/clan_cli/machines/update.py @@ -120,6 +120,7 @@ def deploy_machine(machines: MachineGroup) -> None: generate_vars([machine], None, False) upload_secrets(machine) + path = upload_sources( machine, ) @@ -151,7 +152,10 @@ def deploy_machine(machines: MachineGroup) -> None: if ret.returncode != 0: ret = host.run(cmd, extra_env=env) - machines.run_function(deploy) + if len(machines.group.hosts) > 1: + machines.run_function(deploy) + else: + deploy(machines.machines[0]) def update(args: argparse.Namespace) -> None: