nvidia: simplify nvidia-ctk command and import override.conf

saltyorg · Feb 18, 2024 · 22eeff2 · 22eeff2
1 parent c663f66
commit 22eeff2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
@@ -112,7 +112,7 @@ docker_ipv6: "{{ dns.ipv6 }}"
 
 # Service
 
-docker_service_after: "{{ mergerfs_service_name + (' nvidia-persistenced.service' if gpu.nvidia else '') }}"
+docker_service_after: "{{ mergerfs_service_name + (' nvidia-persistenced.service' if (gpu.nvidia and nvidia_ctk is defined and nvidia_ctk.stat.exists) else '') }}"
 
 docker_service_sleep: "{{ 0 if continuous_integration else 120 }}"
 

diff --git a/roles/nvidia/files/71-nvidia-dev-char.rules b/roles/nvidia/files/71-nvidia-dev-char.rules
diff --git a/roles/nvidia/files/nvidia-persistenced.service b/roles/nvidia/files/nvidia-persistenced.service
@@ -5,7 +5,7 @@ Wants=syslog.target
 [Service]
 Type=forking
 ExecStart=/usr/bin/nvidia-persistenced
-ExecStartPre=/usr/bin/nvidia-ctk system create-dev-char-symlinks --create-all --load-kernel-modules --create-device-nodes
+ExecStartPre=/usr/bin/nvidia-ctk system create-dev-char-symlinks --create-all
 ExecStopPost=/bin/rm -rf /var/run/nvidia-persistenced
 
 [Install]

diff --git a/roles/nvidia/tasks/subtasks/docker.yml b/roles/nvidia/tasks/subtasks/docker.yml
@@ -50,15 +50,7 @@
     state: present
 
 - name: Docker | Create '/dev/char' symlinks
-  ansible.builtin.shell: nvidia-ctk system create-dev-char-symlinks --create-all --load-kernel-modules --create-device-nodes
-
-- name: Docker | Import '71-nvidia-dev-char.rules'
-  ansible.builtin.copy:
-    src: 71-nvidia-dev-char.rules
-    dest: "/lib/udev/rules.d/71-nvidia-dev-char.rules"
-    owner: "root"
-    group: "root"
-    mode: "0644"
+  ansible.builtin.shell: nvidia-ctk system create-dev-char-symlinks --create-all
 
 - name: Docker | Populate Service Facts
   ansible.builtin.service_facts:
@@ -102,6 +94,18 @@
     state: started
     enabled: true
 
+- name: Docker | Check if '/usr/bin/nvidia-ctk' exists
+  ansible.builtin.stat:
+    path: "/usr/bin/nvidia-ctk"
+  register: nvidia_ctk
+
+- name: "Docker | Import override file"
+  ansible.builtin.template:
+    src: override.conf.j2
+    dest: /etc/systemd/system/docker.service.d/override.conf
+    mode: "0644"
+    force: "{{ docker_service_force }}"
+
 # https://github.com/linkernetworks/vortex-installer/blob/master/roles/common/tasks/nvidia-docker.yml
 - name: Docker | Add runtime to '/etc/docker/daemon.json'
   ansible.builtin.shell: "{{ nvidia_docker_runtime_docker_daemon_json_jq_command }}"