x/tobiko
Code Issues Proposed changes

Merge "[BGP] Fix ssh tunnel used to connect to podman socket"

Browse Source
This commit is contained in:
Zuul 2022-12-12 12:01:12 +00:00 committed by Gerrit Code Review
commit 59796bf7ed
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tobiko/podman/_client.py
View File

@ -135,6 +135,9 @@ class PodmanClientFixture(tobiko.SharedFixture):
podman_remote_socket = self.discover_podman_socket() podman_remote_socket = self.discover_podman_socket()
username = self.ssh_client.connect_parameters['username'] username = self.ssh_client.connect_parameters['username']
host = self.ssh_client.connect_parameters["hostname"] host = self.ssh_client.connect_parameters["hostname"]
key_files = self.ssh_client.connect_parameters.get(
'key_filename', [])
key_file = key_files[0] if len(key_files) > 0 else None
socket = podman_remote_socket socket = podman_remote_socket
podman_remote_socket_uri = f'unix:/tmp/podman.sock_{host}' podman_remote_socket_uri = f'unix:/tmp/podman.sock_{host}'
@ -148,10 +151,13 @@ class PodmanClientFixture(tobiko.SharedFixture):
subprocess.call( subprocess.call(
['rm', '-f', f'/tmp/podman.sock_{host}']) ['rm', '-f', f'/tmp/podman.sock_{host}'])
# start a background ssh tunnel with the remote host # start a background ssh tunnel with the remote host
subprocess.call(['ssh', '-L', command = [
f'/tmp/podman.sock_{host}:' 'ssh', '-o', 'strictHostKeyChecking=no', '-L',
f'/run/podman/podman.sock', f'/tmp/podman.sock_{host}:/run/podman/podman.sock',
host, '-N', '-f']) '-l', username, host, '-N', '-f']
if key_file:
command += ['-i', key_file]
subprocess.call(command)
for _ in tobiko.retry(timeout=60., interval=1.): for _ in tobiko.retry(timeout=60., interval=1.):
if os.path.exists(f'/tmp/podman.sock_{host}'): if os.path.exists(f'/tmp/podman.sock_{host}'):
break break