From 4cd9569e215564e4b747423c687a78f612cab914 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Sun, 24 May 2020 11:49:28 +0100
Subject: [PATCH] ansible: Split installation of Go from other dependencies

This makes it easier to skip, if Go has been installed by other means.
---
 scripts/ansible/roles/ava-base/tasks/main.yml    | 3 +--
 scripts/ansible/roles/golang-base/tasks/main.yml | 9 +++++++++
 scripts/ansible/service_playbook.yml             | 3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 scripts/ansible/roles/golang-base/tasks/main.yml

diff --git a/scripts/ansible/roles/ava-base/tasks/main.yml b/scripts/ansible/roles/ava-base/tasks/main.yml
index 9fea86c..42a88e2 100644
--- a/scripts/ansible/roles/ava-base/tasks/main.yml
+++ b/scripts/ansible/roles/ava-base/tasks/main.yml
@@ -1,4 +1,4 @@
-- name: Install deps
+- name: Install AVA dependencies
   become: true
   apt:
     name:
@@ -6,7 +6,6 @@
       - cmake
       - curl
       - g++
-      - golang-go  # Assumes Ubuntu 20.04, where this installs Go 1.13
       - libssl-dev
       - libuv1-dev
       - make
diff --git a/scripts/ansible/roles/golang-base/tasks/main.yml b/scripts/ansible/roles/golang-base/tasks/main.yml
new file mode 100644
index 0000000..988c307
--- /dev/null
+++ b/scripts/ansible/roles/golang-base/tasks/main.yml
@@ -0,0 +1,9 @@
+- name: Install Go
+  become: true
+  apt:
+    name:
+      # AVA (in May 2020) requires Go 1.13. On Ubuntu 20.04 LTS this package,
+      # provides the appropriate version.
+      - golang-go
+  tags:
+    - golang-base
diff --git a/scripts/ansible/service_playbook.yml b/scripts/ansible/service_playbook.yml
index 06b45bb..06ec6a5 100755
--- a/scripts/ansible/service_playbook.yml
+++ b/scripts/ansible/service_playbook.yml
@@ -3,8 +3,9 @@
 - name: Configure AVA service
   hosts: ava_nodes
   roles:
-    - name: ava-base
+    - name: golang-base
     - name: gopath
+    - name: ava-base
     - name: ava-build
     - name: ava-user
     - name: ava-install