From ef00255cac52fbd27bb9a779f830beeb6845ed87 Mon Sep 17 00:00:00 2001
From: Asara <amarpreet@minhas.io>
Date: Wed, 8 Sep 2021 22:39:07 -0400
Subject: [PATCH] Rename podman_prep to podman, remove version pinning for
 podman to save headaches in the short term

---
 ansible/group_vars/all/main.yml                     |  3 ---
 ansible/roles/nomad_client/tasks/main.yml           |  2 +-
 .../tasks/{podman_prep.yml => podman.yml}           | 13 +++++++++++--
 3 files changed, 12 insertions(+), 6 deletions(-)
 rename ansible/roles/nomad_client/tasks/{podman_prep.yml => podman.yml} (66%)

diff --git a/ansible/group_vars/all/main.yml b/ansible/group_vars/all/main.yml
index c2ad94e..b80ef68 100644
--- a/ansible/group_vars/all/main.yml
+++ b/ansible/group_vars/all/main.yml
@@ -63,9 +63,6 @@ vault_ca_cert_payload: |
 nomad_version: 1.1.3
 nomad_podman_driver_version: 0.3.0
 
-# podman
-podman_version: 3.0.1+dfsg1-3+b2
-
 # lnd
 lnd_version: 0.13.1-beta
 
diff --git a/ansible/roles/nomad_client/tasks/main.yml b/ansible/roles/nomad_client/tasks/main.yml
index b319164..c776421 100644
--- a/ansible/roles/nomad_client/tasks/main.yml
+++ b/ansible/roles/nomad_client/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-- import_tasks: podman_prep.yml
+- import_tasks: podman.yml
 - import_tasks: nomad.yml
 - import_tasks: client_setup.yml
 ...
diff --git a/ansible/roles/nomad_client/tasks/podman_prep.yml b/ansible/roles/nomad_client/tasks/podman.yml
similarity index 66%
rename from ansible/roles/nomad_client/tasks/podman_prep.yml
rename to ansible/roles/nomad_client/tasks/podman.yml
index ac5a409..b558107 100644
--- a/ansible/roles/nomad_client/tasks/podman_prep.yml
+++ b/ansible/roles/nomad_client/tasks/podman.yml
@@ -16,15 +16,24 @@
   apt:
     name:
       - fuse-overlayfs
-      - "podman={{ podman_version }}"
+      - podman
+      - slirp4netns
       - uidmap
     state: present
 
+- name: ensure containers.conf is configured
+  file:
+    src: containers.conf
+    dest: /etc/containers/containers.conf
+    owner: root
+    group: root
+    mode: 0644
+
 - name: enable podman
   systemd:
     name: podman
     state: started
-    enabled: True
+    enabled: False
     daemon_reload: True
   changed_when: False
 ...