fix contractor so it works for subplot

3 files changed, 5 insertions, 4 deletions

diff --git a/contractor b/contractor
index 9d06e34..75d809f 100755
--- a/contractor
+++ b/contractor
@@ -553,17 +553,17 @@ def upload_worker_image(vrb, filename, dest, port):
 def sync_to_workspace(vrb, frm, dest, port, subdir):
     destdir = "{}/{}".format(WS_MNT, subdir)
     vrb("syncing local {} to manager {}".format(frm, destdir))
-    er = rsync("{}/.".format(frm), "{}:{}/.".format(dest, destdir), port)
+    er = rsync(f"{frm}/.", f"{dest}:{destdir}/.", port)
     if er.failed():
         error("Failed to rsync saved workspace to worker")
         sys.exit(1)
 
 
 def sync_from_workspace(vrb, dest, port, ws):
-    vrb("syncing manager {} to local {}".format(WS_MNT, ws))
+    vrb("syncing manager {!r} to local {!r} (port {!r})".format(WS_MNT, ws, port))
     if not os.path.exists(ws):
         os.makedirs(ws)
-    er = rsync("{}:{}/.".format(dest), "{}/.".format(WS_MNT, ws), port)
+    er = rsync(f"{dest}:{WS_MNT}/.", f"{ws}/.", port)
     if er.failed():
         error("Failed to rsync workspace from worker")
         sys.exit(1)
diff --git a/manager.yml b/manager.yml
index 8f41d21..c6241c6 100644
--- a/manager.yml
+++ b/manager.yml
@@ -25,6 +25,7 @@
           - rsync
           - kpartx
           - python3-lxml
+          - ansible
 
     - name: change IP block in default virtual network
       replace:
diff --git a/nop.yaml b/nop.yaml
index 8d168cd..0a84568 100644
--- a/nop.yaml
+++ b/nop.yaml
@@ -1,4 +1,4 @@
-worker-image: ~/worker.img
+worker-image: ~/tmp/contractor/worker.img
 source: .
 build: |
   echo hello, world