From 590e8b5d83b231bb004cd43290178ecd94dab1ce Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Mon, 3 Jul 2023 12:00:08 +0200
Subject: [PATCH] Update to 2023-07-03 12:00

---
 roles/nomad/handlers/main.yml                 |  4 ++++
 roles/nomad/tasks/install.yml                 | 14 +++++++++-----
 roles/nomad/templates/nomad.service.j2        |  2 ++
 roles/nomad/vars/RedHat-9.yml                 | 12 ------------
 roles/nomad/vars/{RedHat-8.yml => RedHat.yml} |  6 ++++++
 5 files changed, 21 insertions(+), 17 deletions(-)
 delete mode 100644 roles/nomad/vars/RedHat-9.yml
 rename roles/nomad/vars/{RedHat-8.yml => RedHat.yml} (77%)

diff --git a/roles/nomad/handlers/main.yml b/roles/nomad/handlers/main.yml
index 5e96110..158afc0 100644
--- a/roles/nomad/handlers/main.yml
+++ b/roles/nomad/handlers/main.yml
@@ -11,3 +11,7 @@
 
 - name: restart consul-template-nomad
   service: name=consul-template-nomad state=restarted
+
+- name: systemd-tmpfiles
+  command: systemd-tmpfiles --create
+
diff --git a/roles/nomad/tasks/install.yml b/roles/nomad/tasks/install.yml
index 0ff0d24..40b597e 100644
--- a/roles/nomad/tasks/install.yml
+++ b/roles/nomad/tasks/install.yml
@@ -2,11 +2,7 @@
 
 - name: Install needed tools
   package:
-    name:
-      - tar
-      - zstd
-      - unzip
-      - acl
+    name: "{{ nomad_packages }}"
   tags: nomad
 
 - name: Install task driver packages
@@ -129,6 +125,14 @@
     - post
   tags: nomad
 
+- name: Create tmpfile fragment
+  copy:
+    content: |
+      d /run/nomad 775 root {{ nomad_user }}
+    dest: /etc/tmpfiles.d/nomad.conf
+  notify: systemd-tmpfiles
+  tags: nomad
+
 - name: Install iptables cleanup script
   copy: src=iptables_cleanup.pl dest={{ nomad_root_dir }}/bin/iptables_cleanup.pl mode=755
   tags: nomad
diff --git a/roles/nomad/templates/nomad.service.j2 b/roles/nomad/templates/nomad.service.j2
index 2d61d06..f779141 100644
--- a/roles/nomad/templates/nomad.service.j2
+++ b/roles/nomad/templates/nomad.service.j2
@@ -3,6 +3,8 @@ Description=Nomad
 Documentation=https://nomadproject.io/docs/
 Wants=network-online.target
 After=network-online.target
+After=vault.service
+After=consul.service
 ConditionFileNotEmpty={{ nomad_root_dir }}/etc/nomad.hcl
 
 [Service]
diff --git a/roles/nomad/vars/RedHat-9.yml b/roles/nomad/vars/RedHat-9.yml
deleted file mode 100644
index 08396f4..0000000
--- a/roles/nomad/vars/RedHat-9.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-nomad_task_driver_packages:
-  java:
-    - java-17-openjdk-headless
-  qemu:
-    - qemu-kvm
-  podman:
-    - podman
-    - podman-docker
-  containerd-driver:
-    - containerd.io
diff --git a/roles/nomad/vars/RedHat-8.yml b/roles/nomad/vars/RedHat.yml
similarity index 77%
rename from roles/nomad/vars/RedHat-8.yml
rename to roles/nomad/vars/RedHat.yml
index 08396f4..a36f042 100644
--- a/roles/nomad/vars/RedHat-8.yml
+++ b/roles/nomad/vars/RedHat.yml
@@ -1,5 +1,11 @@
 ---
 
+nomad_packages:
+  - tar
+  - zstd
+  - unzip
+  - acl
+
 nomad_task_driver_packages:
   java:
     - java-17-openjdk-headless