ansible/group_vars/all/main.yml

@@ -61,7 +61,7 @@ vault_ca_cert_payload: |
 
 # nomad
 nomad_version: 1.1.3
-nomad_podman_driver_version: 0.3.0
+nomad_podman_driver_version: 0.1.0
 
 # podman
 podman_version: 3.0.1+dfsg1-3+b2

ansible/group_vars/hardtack/main.yml

@@ -1,5 +0,0 @@
----
-hashi_arch: arm
-consul_arch: arm64
-nomad_arch: arm64
-docker_arch: arm64

ansible/group_vars/hardtack/nomad.yml

@@ -1,5 +0,0 @@
----
-nomad_meta_values:
-  - { name: "storage_optimized", value: "false" }
-  - { name: "ram_optimized", value: "false" }
-...

ansible/inventory.txt

@@ -1,22 +1,15 @@
 [all]
 fatman.minhas.io
-hardtack[1:7].minhas.io
 ivyking.minhas.io
 ranger.minhas.io
-redwingcherokee.minhas.io
 sedan.minhas.io
+redwingcherokee.minhas.io
 
 [consul_server]
 fatman.minhas.io
 ivyking.minhas.io
 sedan.minhas.io
 
-[haproxy]
-ivyking.minhas.io
-
-[hardtack]
-hardtack[1:7].minhas.io
-
 [lnd]
 redwingcherokee.minhas.io
 
@@ -24,9 +17,8 @@ redwingcherokee.minhas.io
 ivyking.minhas.io
 
 [nomad_client]
-hardtack[1:7].minhas.io
-ivyking.minhas.io
 sedan.minhas.io
+ivyking.minhas.io
 
 [nomad_server]
 ranger.minhas.io
@@ -37,3 +29,6 @@ sedan.minhas.io
 
 [wekan]
 sedan.minhas.io
+
+[haproxy]
+ivyking.minhas.io

ansible/roles/docker/defaults/main.yml

@@ -1,2 +0,0 @@
----
-docker_arch: amd64

ansible/roles/docker/tasks/main.yml

@@ -17,16 +17,13 @@
 
 - name: add docker repo
   apt_repository:
-    repo: "deb [arch={{ docker_arch }}] https://download.docker.com/linux/debian bullseye stable"
+    repo: deb [arch=amd64] https://download.docker.com/linux/debian buster stable
     state: present
-    mode: 0644
+    mode: 0600
 
-- name: update apt cache
-  apt:
 - name: install docker-ce
   apt:
     state: present
-    update_cache: True
     name:
       - docker-ce
       - docker-ce-cli

ansible/roles/nomad_client/defaults/main.yml

@@ -1,2 +0,0 @@
----
-nomad_arch: amd64

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_{{ nomad_arch }}.zip"
+    src: "https://releases.hashicorp.com/nomad/{{ nomad_version }}/nomad_{{ nomad_version }}_linux_amd64.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_{{ nomad_arch }}.zip"
+    src: "https://releases.hashicorp.com/nomad-driver-podman/{{ nomad_podman_driver_version }}/nomad-driver-podman_{{ nomad_podman_driver_version }}_linux_amd64.zip"
     dest: /opt/nomad_plugins/
     mode: 0755
     owner: nomad

ansible/roles/nomad_client/tasks/podman_prep.yml

@@ -14,17 +14,14 @@
 
 - name: ensure podman is installed
   apt:
-    name:
-      - fuse-overlayfs
-      - "podman={{ podman_version }}"
-      - uidmap
+    name: "podman={{ podman_version }}"
     state: present
 
-- name: enable podman
-  systemd:
-    name: podman
-    state: started
-    enabled: True
-    daemon_reload: True
-  changed_when: False
+- name: ensure podman socket is configured
+  copy:
+    src: files/podman.socket
+    dest: /etc/systemd/system/podman.socket
+    owner: root
+    group: root
+    mode: 0755
 ...

ansible/roles/nomad_client/templates/nomad.hcl.j2

@@ -38,7 +38,4 @@ plugin_dir = "/opt/nomad_plugins"
 
 plugin "nomad-driver-podman" {
   enabled   = true
-  config {
-    socket_path = "unix:///run/user/1000/podman/podman.sock"
-  }
 }