From b845d6bc51fb877dd82c34ed94c946701906d638 Mon Sep 17 00:00:00 2001
From: Asara <amarpreet@minhas.io>
Date: Sun, 15 Aug 2021 21:30:56 -0400
Subject: [PATCH] Update nomad/docker to include arm64 builds

---
 ansible/roles/docker/defaults/main.yml        |  2 ++
 ansible/roles/docker/tasks/main.yml           |  7 +++++--
 ansible/roles/nomad_client/defaults/main.yml  |  2 ++
 ansible/roles/nomad_client/tasks/nomad.yml    |  4 ++--
 .../roles/nomad_client/tasks/podman_prep.yml  | 19 +++++++++++--------
 .../roles/nomad_client/templates/nomad.hcl.j2 |  3 +++
 6 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100644 ansible/roles/docker/defaults/main.yml
 create mode 100644 ansible/roles/nomad_client/defaults/main.yml

diff --git a/ansible/roles/docker/defaults/main.yml b/ansible/roles/docker/defaults/main.yml
new file mode 100644
index 0000000..2fef907
--- /dev/null
+++ b/ansible/roles/docker/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+docker_arch: amd64
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index fcce64d..91a7171 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -17,13 +17,16 @@
 
 - name: add docker repo
   apt_repository:
-    repo: deb [arch=amd64] https://download.docker.com/linux/debian buster stable
+    repo: "deb [arch={{ docker_arch }}] https://download.docker.com/linux/debian bullseye stable"
     state: present
-    mode: 0600
+    mode: 0644
 
+- name: update apt cache
+  apt:
 - name: install docker-ce
   apt:
     state: present
+    update_cache: True
     name:
       - docker-ce
       - docker-ce-cli
diff --git a/ansible/roles/nomad_client/defaults/main.yml b/ansible/roles/nomad_client/defaults/main.yml
new file mode 100644
index 0000000..f0ff545
--- /dev/null
+++ b/ansible/roles/nomad_client/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+nomad_arch: amd64
diff --git a/ansible/roles/nomad_client/tasks/nomad.yml b/ansible/roles/nomad_client/tasks/nomad.yml
index 4d9d0ac..c4e0c24 100644
--- a/ansible/roles/nomad_client/tasks/nomad.yml
+++ b/ansible/roles/nomad_client/tasks/nomad.yml
@@ -42,7 +42,7 @@
 
 - name: get nomad
   unarchive:
-    src: "https://releases.hashicorp.com/nomad/{{ nomad_version }}/nomad_{{ nomad_version }}_linux_amd64.zip"
+    src: "https://releases.hashicorp.com/nomad/{{ nomad_version }}/nomad_{{ nomad_version }}_linux_{{ nomad_arch }}.zip"
     dest: /usr/local/bin/
     mode: 0755
     owner: root
@@ -78,7 +78,7 @@
 
 - name: get nomad podman plugins
   unarchive:
-    src: "https://releases.hashicorp.com/nomad-driver-podman/{{ nomad_podman_driver_version }}/nomad-driver-podman_{{ nomad_podman_driver_version }}_linux_amd64.zip"
+    src: "https://releases.hashicorp.com/nomad-driver-podman/{{ nomad_podman_driver_version }}/nomad-driver-podman_{{ nomad_podman_driver_version }}_linux_{{ nomad_arch }}.zip"
     dest: /opt/nomad_plugins/
     mode: 0755
     owner: nomad
diff --git a/ansible/roles/nomad_client/tasks/podman_prep.yml b/ansible/roles/nomad_client/tasks/podman_prep.yml
index b11d21d..ac5a409 100644
--- a/ansible/roles/nomad_client/tasks/podman_prep.yml
+++ b/ansible/roles/nomad_client/tasks/podman_prep.yml
@@ -14,14 +14,17 @@
 
 - name: ensure podman is installed
   apt:
-    name: "podman={{ podman_version }}"
+    name:
+      - fuse-overlayfs
+      - "podman={{ podman_version }}"
+      - uidmap
     state: present
 
-- name: ensure podman socket is configured
-  copy:
-    src: files/podman.socket
-    dest: /etc/systemd/system/podman.socket
-    owner: root
-    group: root
-    mode: 0755
+- name: enable podman
+  systemd:
+    name: podman
+    state: started
+    enabled: True
+    daemon_reload: True
+  changed_when: False
 ...
diff --git a/ansible/roles/nomad_client/templates/nomad.hcl.j2 b/ansible/roles/nomad_client/templates/nomad.hcl.j2
index f64cabb..8f16081 100644
--- a/ansible/roles/nomad_client/templates/nomad.hcl.j2
+++ b/ansible/roles/nomad_client/templates/nomad.hcl.j2
@@ -38,4 +38,7 @@ plugin_dir = "/opt/nomad_plugins"
 
 plugin "nomad-driver-podman" {
   enabled   = true
+  config {
+    socket_path = "unix:///run/user/1000/podman/podman.sock"
+  }
 }