summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2020-04-23 19:47:00 +0300
committerLars Wirzenius <liw@liw.fi>2020-04-24 07:30:07 +0300
commitc5e81365d1b5e797ac39297698c06da9049daf9a (patch)
treef2109429b8d3dd4f94218d4d4d10e4e1eae3b4b7
parent196d6b240daff1009c462c3ed932c49222c0753d (diff)
downloadick-contractor-c5e81365d1b5e797ac39297698c06da9049daf9a.tar.gz
Change: use Ansible to configure worker
This means we no longer require the worker to run Debian.
-rwxr-xr-xcontractor5
-rw-r--r--heippa.yaml12
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: |