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

Host: actual setup ssh controlmaster

Browse Source 
before we were not entering the context manager
This commit is contained in:
Jörg Thalheim
2025-05-06 10:24:58 +02:00
parent 8af68cbd9d
commit 864cdf33a7
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/clan-cli/clan_cli/machines/machines.py
View File

@@ -149,13 +149,14 @@ class Machine:
@contextmanager
def target_host(self) -> Iterator[Host]:
yield parse_deployment_address(
with parse_deployment_address(
self.name,
self.target_host_address,
self.host_key_check,
private_key=self.private_key,
meta={"machine": self},
)
) as target_host:
yield target_host
@contextmanager
def build_host(self) -> Iterator[Host | None]:
@@ -165,18 +166,18 @@ class Machine:
"""
build_host = self.override_build_host or self.deployment.get("buildHost")
if build_host is None:
with self.target_host() as target_host:
yield target_host
yield None
return
# enable ssh agent forwarding to allow the build host to access the target host
yield parse_deployment_address(
with parse_deployment_address(
self.name,
build_host,
self.host_key_check,
forward_agent=True,
private_key=self.private_key,
meta={"machine": self},
)
) as build_host:
yield build_host
@cached_property
def deploy_as_root(self) -> bool: