nvidia: fix the templating

saltyorg · Feb 18, 2024 · c653082 · c653082
1 parent 2e237f5
commit c653082
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 27 deletions.
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
@@ -87,12 +87,11 @@
       when: nvidia_ctk.stat.exists
       block:
         - name: Import 'nvidia-persistenced.service'
-          ansible.builtin.copy:
-            src: nvidia-persistenced.service
-            dest: "/etc/systemd/system/nvidia-persistenced.service"
-            owner: "root"
-            group: "root"
+          ansible.builtin.template:
+            src: nvidia-persistenced.service.j2
+            dest: /etc/systemd/system/nvidia-persistenced.service
             mode: "0644"
+            force: true
 
         - name: Run systemd daemon-reload
           ansible.builtin.systemd_service:

diff --git a/.../docker/files/nvidia-persistenced.service → .../templates/nvidia-persistenced.service.j2 b/.../docker/files/nvidia-persistenced.service → .../templates/nvidia-persistenced.service.j2
@@ -6,7 +6,7 @@ Wants=syslog.target
 Type=forking
 {% if nvidia_docker_enable_nvidia_ctk %}
 ExecStartPre=/usr/bin/nvidia-ctk system create-dev-char-symlinks --create-all
-{% else %}
+{% endif %}
 ExecStart=/usr/bin/nvidia-persistenced
 ExecStopPost=/bin/rm -rf /var/run/nvidia-persistenced
 

diff --git a/roles/nvidia/files/nvidia-persistenced.service b/roles/nvidia/files/nvidia-persistenced.service
diff --git a/roles/nvidia/tasks/subtasks/docker.yml b/roles/nvidia/tasks/subtasks/docker.yml
@@ -78,12 +78,11 @@
   when: docker_service_running
 
 - name: Docker | Import 'nvidia-persistenced.service'
-  ansible.builtin.copy:
-    src: nvidia-persistenced.service
-    dest: "/etc/systemd/system/nvidia-persistenced.service"
-    owner: "root"
-    group: "root"
+  ansible.builtin.template:
+    src: "/srv/git/saltbox/roles/docker/templates/nvidia-persistenced.service.j2"
+    dest: /etc/systemd/system/nvidia-persistenced.service
     mode: "0644"
+    force: true
 
 - name: Docker | Run systemd daemon-reload
   ansible.builtin.systemd_service:
@@ -102,8 +101,8 @@
 
 - name: "Docker | Import override file"
   ansible.builtin.template:
-    src: override.conf.j2
-    dest: /etc/systemd/system/docker.service.d/override.conf
+    src: "/srv/git/saltbox/roles/docker/templates/override.conf.j2"
+    dest: "/etc/systemd/system/docker.service.d/override.conf"
     mode: "0644"
     force: "{{ docker_service_force }}"