From c5e81365d1b5e797ac39297698c06da9049daf9a Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Thu, 23 Apr 2020 19:47:00 +0300
Subject: Change: use Ansible to configure worker

This means we no longer require the worker to run Debian.
---
 contractor  |  5 +++--
 heippa.yaml | 12 ++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/contractor b/contractor
index 2f1f372..8bbaabf 100755
--- a/contractor
+++ b/contractor
@@ -264,9 +264,10 @@ class RemoteServer:
 
     def _msg(self, execs):
         if self._verbose is not None:
+            self._verbose('Executing steps')
             for e in execs:
                 m = e.msg() or e.__class__.__name__
-                self._verbose('  ' + m)
+                self._verbose('  - ' + m)
 
     def _argv(self, execs):
         self._msg(execs)
@@ -547,7 +548,7 @@ status=/var/lib/libvirt/dnsmasq/virbr0.status
 while true
 do
     ip="$(jq -r '.[-1]["ip-address"]' "$status")"
-    ssh-keygen -R "$ip" 2> /dev/null > /dev/null
+    ssh-keygen -R "$ip" 2> /dev/null > /dev/null || true
     if ssh "worker@$ip" true 2> /dev/null
     then
         break
diff --git a/heippa.yaml b/heippa.yaml
index da402f5..4ec5f9b 100644
--- a/heippa.yaml
+++ b/heippa.yaml
@@ -1,6 +1,14 @@
 worker-image: worker.img
-install:
-  - build-essential
+ansible:
+  - hosts: worker
+    remote_user: worker
+    become: yes
+    tasks:
+    - apt:
+        name:
+        - build-essential
+    vars:
+      ansible_python_interpreter: /usr/bin/python3
 source: /tmp/heippa
 workspace: /tmp/heippa-workspace
 build: |
-- 
cgit v1.2.1