From dbeb5f5344600baab1483c0d2ab9f415dae66538 Mon Sep 17 00:00:00 2001 From: Erik M Jacobs Date: Mon, 15 Oct 2018 14:45:00 -0400 Subject: [PATCH 1/3] Changes to variable-ize the runtime-hook and cuda repos. --- .../defaults/main.yaml | 3 +++ .../tasks/main.yaml | 27 +++++++++++++++++-- .../nvidia-driver-install/defaults/main.yaml | 2 ++ .../nvidia-driver-install/tasks/main.yaml | 11 ++++++-- 4 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 playbooks/roles/nvidia-container-runtime-hook/defaults/main.yaml create mode 100644 playbooks/roles/nvidia-driver-install/defaults/main.yaml diff --git a/playbooks/roles/nvidia-container-runtime-hook/defaults/main.yaml b/playbooks/roles/nvidia-container-runtime-hook/defaults/main.yaml new file mode 100644 index 0000000..9ebc75c --- /dev/null +++ b/playbooks/roles/nvidia-container-runtime-hook/defaults/main.yaml @@ -0,0 +1,3 @@ +nvidia_container_hook_repo_base_url: 'https://nvidia.github.io/' +libnvidia_container_suffix: 'libnvidia-container/centos7/$basearch' +nvidia_container_runtime_suffix: 'nvidia-container-runtime/centos7/$basearch' \ No newline at end of file diff --git a/playbooks/roles/nvidia-container-runtime-hook/tasks/main.yaml b/playbooks/roles/nvidia-container-runtime-hook/tasks/main.yaml index 229dbbd..1e8c557 100644 --- a/playbooks/roles/nvidia-container-runtime-hook/tasks/main.yaml +++ b/playbooks/roles/nvidia-container-runtime-hook/tasks/main.yaml @@ -1,6 +1,29 @@ --- -- name: install NVIDIA repo for container runtime hook - shell: yum-config-manager --add-repo=https://nvidia.github.io/nvidia-container-runtime/centos7/x86_64/nvidia-container-runtime.repo +- name: libnvidia-container repo + yum_repository: + name: libnvidia-container + description: libnvidia-container + baseurl: '{{ nvidia_container_hook_repo_base_url }}{{ libnvidia_container_suffix }}' + repo_gpgcheck: true + gpgcheck: false + enabled: 1 + gpgkey: https://nvidia.github.io/libnvidia-container/gpgkey + sslverify: 1 + sslcacert: /etc/pki/tls/certs/ca-bundle.crt + state: present + +- name: nvidia-container-runtime repo + yum_repository: + name: nvidia-container-runtime + description: nvidia-container-runtime + baseurl: '{{ nvidia_container_hook_repo_base_url }}{{ nvidia_container_runtime_suffix }}' + repo_gpgcheck: true + gpgcheck: false + enabled: 1 + gpgkey: https://nvidia.github.io/nvidia-container-runtime/gpgkey + sslverify: 1 + sslcacert: /etc/pki/tls/certs/ca-bundle.crt + state: present - name: install nvidia-container-runtime-hook yum: name=nvidia-container-runtime-hook state=latest diff --git a/playbooks/roles/nvidia-driver-install/defaults/main.yaml b/playbooks/roles/nvidia-driver-install/defaults/main.yaml new file mode 100644 index 0000000..c9c9749 --- /dev/null +++ b/playbooks/roles/nvidia-driver-install/defaults/main.yaml @@ -0,0 +1,2 @@ +cuda_driver_repo_base_url: 'http://developer.download.nvidia.com/' +cuda_driver_repo_suffix: 'compute/cuda/repos/rhel7/x86_64' \ No newline at end of file diff --git a/playbooks/roles/nvidia-driver-install/tasks/main.yaml b/playbooks/roles/nvidia-driver-install/tasks/main.yaml index a46c87d..15b267c 100644 --- a/playbooks/roles/nvidia-driver-install/tasks/main.yaml +++ b/playbooks/roles/nvidia-driver-install/tasks/main.yaml @@ -6,8 +6,15 @@ - name: install EPEL yum: name=https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm state=present -- name: install NVIDIA repo - yum: name=https://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/cuda-repo-rhel7-9.1.85-1.x86_64.rpm state=present +- name: cuda NVIDIA repository + yum_repository: + name: cuda + description: cuda + baseurl: '{{ cuda_driver_repo_base_url }}{{ cuda_driver_repo_suffix }}' + enabled: 1 + gpgcheck: 1 + gpgkey: http://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/7fa2af80.pub + state: present - name: install NVIDIA drivers yum: name={{item}} state=present From 080aa687c138cc0ffcedea82879ffa5dd3627fdc Mon Sep 17 00:00:00 2001 From: Erik M Jacobs Date: Tue, 16 Oct 2018 10:21:00 -0400 Subject: [PATCH 2/3] switches repo/gpgcheck to variables, too --- .../nvidia-container-runtime-hook/defaults/main.yaml | 6 +++++- .../roles/nvidia-container-runtime-hook/tasks/main.yaml | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/playbooks/roles/nvidia-container-runtime-hook/defaults/main.yaml b/playbooks/roles/nvidia-container-runtime-hook/defaults/main.yaml index 9ebc75c..e032bff 100644 --- a/playbooks/roles/nvidia-container-runtime-hook/defaults/main.yaml +++ b/playbooks/roles/nvidia-container-runtime-hook/defaults/main.yaml @@ -1,3 +1,7 @@ nvidia_container_hook_repo_base_url: 'https://nvidia.github.io/' libnvidia_container_suffix: 'libnvidia-container/centos7/$basearch' -nvidia_container_runtime_suffix: 'nvidia-container-runtime/centos7/$basearch' \ No newline at end of file +libnvidia_container_repo_gpgcheck: true +libnvidia_container_gpgcheck: false +nvidia_container_runtime_suffix: 'nvidia-container-runtime/centos7/$basearch' +nvidia_container_runtime_repo_gpgcheck: true +nvidia_container_runtime_gpgcheck: false \ No newline at end of file diff --git a/playbooks/roles/nvidia-container-runtime-hook/tasks/main.yaml b/playbooks/roles/nvidia-container-runtime-hook/tasks/main.yaml index 1e8c557..4bc0aba 100644 --- a/playbooks/roles/nvidia-container-runtime-hook/tasks/main.yaml +++ b/playbooks/roles/nvidia-container-runtime-hook/tasks/main.yaml @@ -4,8 +4,8 @@ name: libnvidia-container description: libnvidia-container baseurl: '{{ nvidia_container_hook_repo_base_url }}{{ libnvidia_container_suffix }}' - repo_gpgcheck: true - gpgcheck: false + repo_gpgcheck: {{ libnvidia_container_repo_gpgcheck }} + gpgcheck: {{ libnvidia_container_gpgcheck }} enabled: 1 gpgkey: https://nvidia.github.io/libnvidia-container/gpgkey sslverify: 1 @@ -17,8 +17,8 @@ name: nvidia-container-runtime description: nvidia-container-runtime baseurl: '{{ nvidia_container_hook_repo_base_url }}{{ nvidia_container_runtime_suffix }}' - repo_gpgcheck: true - gpgcheck: false + repo_gpgcheck: {{ nvidia_container_runtime_repo_gpgcheck }} + gpgcheck: {{ nvidia_container_runtime_gpgcheck }} enabled: 1 gpgkey: https://nvidia.github.io/nvidia-container-runtime/gpgkey sslverify: 1 From 77a0006841f7e86d3f93388a77d45061dc9183c1 Mon Sep 17 00:00:00 2001 From: Erik M Jacobs Date: Tue, 16 Oct 2018 10:35:11 -0400 Subject: [PATCH 3/3] ansible wants quotes --- .../roles/nvidia-container-runtime-hook/tasks/main.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/roles/nvidia-container-runtime-hook/tasks/main.yaml b/playbooks/roles/nvidia-container-runtime-hook/tasks/main.yaml index 4bc0aba..1ef8252 100644 --- a/playbooks/roles/nvidia-container-runtime-hook/tasks/main.yaml +++ b/playbooks/roles/nvidia-container-runtime-hook/tasks/main.yaml @@ -4,8 +4,8 @@ name: libnvidia-container description: libnvidia-container baseurl: '{{ nvidia_container_hook_repo_base_url }}{{ libnvidia_container_suffix }}' - repo_gpgcheck: {{ libnvidia_container_repo_gpgcheck }} - gpgcheck: {{ libnvidia_container_gpgcheck }} + repo_gpgcheck: '{{ libnvidia_container_repo_gpgcheck }}' + gpgcheck: '{{ libnvidia_container_gpgcheck }}' enabled: 1 gpgkey: https://nvidia.github.io/libnvidia-container/gpgkey sslverify: 1 @@ -17,8 +17,8 @@ name: nvidia-container-runtime description: nvidia-container-runtime baseurl: '{{ nvidia_container_hook_repo_base_url }}{{ nvidia_container_runtime_suffix }}' - repo_gpgcheck: {{ nvidia_container_runtime_repo_gpgcheck }} - gpgcheck: {{ nvidia_container_runtime_gpgcheck }} + repo_gpgcheck: '{{ nvidia_container_runtime_repo_gpgcheck }}' + gpgcheck: '{{ nvidia_container_runtime_gpgcheck }}' enabled: 1 gpgkey: https://nvidia.github.io/nvidia-container-runtime/gpgkey sslverify: 1