summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lwirzenius@wikimedia.org>2020-09-18 17:01:14 +0300
committerLars Wirzenius <lwirzenius@wikimedia.org>2020-09-18 17:01:14 +0300
commit2b9719221ae89cf395da8e774b4f8c183c357f52 (patch)
tree021c08cba3ce798ea2e377e76799e6c425b83edb
parentd6bae004fd1ae6f7864cb3b2aec0904cc38d8c77 (diff)
downloadick-contractor-2b9719221ae89cf395da8e774b4f8c183c357f52.tar.gz
stash
-rwxr-xr-xcontractor4
-rw-r--r--heippa.yaml2
2 files changed, 3 insertions, 3 deletions
diff --git a/contractor b/contractor
index 2811a1c..4fe32a1 100755
--- a/contractor
+++ b/contractor
@@ -50,7 +50,7 @@ class ExecResult:
def ssh(target, port, argv, quiet=False):
- ssh_argv = ["ssh", "-p", str(port), "--", target]
+ ssh_argv = ["ssh", "-F", "ssh.config", "--", target]
argv = ssh_argv + [shlex.quote(arg) for arg in argv]
logging.info("SSH: {!r}".format(argv))
stdout = None
@@ -68,7 +68,7 @@ def ssh(target, port, argv, quiet=False):
def rsync(filename, target, port):
argv = [
"rsync",
- "-essh -p{}".format(port),
+ "-essh -F ssh.config",
"-aHSs",
"--delete",
"--exclude=lost+found",
diff --git a/heippa.yaml b/heippa.yaml
index 4ec5f9b..cff842d 100644
--- a/heippa.yaml
+++ b/heippa.yaml
@@ -1,4 +1,4 @@
-worker-image: worker.img
+worker-image: /mnt/debian-10-openstack-amd64.qcow2
ansible:
- hosts: worker
remote_user: worker