Skip to content

Commit 8f844e9

Browse files
authored
Revert "Add support for configuring Multi-Instance GPUs (MIG) (#656)"
This reverts commit 7509986.
1 parent 7509986 commit 8f844e9

File tree

15 files changed

+3
-362
lines changed

15 files changed

+3
-362
lines changed

.github/workflows/extra.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ jobs:
3232
- image_name: openhpc-extra-RL8
3333
source_image_name_key: RL8 # key into environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
3434
inventory_groups: doca,cuda,lustre
35-
volume_size: 35 # needed for cuda
35+
volume_size: 30 # needed for cuda
3636
- image_name: openhpc-extra-RL9
3737
source_image_name_key: RL9
3838
inventory_groups: doca,cuda,lustre
39-
volume_size: 35 # needed for cuda
39+
volume_size: 30 # needed for cuda
4040
env:
4141
ANSIBLE_FORCE_COLOR: True
4242
OS_CLOUD: openstack

ansible/.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,5 @@ roles/*
9090
!roles/gateway/**
9191
!roles/alertmanager/
9292
!roles/alertmanager/**
93-
!roles/slurm_recompile/**
94-
!roles/slurm_recompile/**
9593
!roles/nhc/
9694
!roles/nhc/**

ansible/extras.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,6 @@
4848
name: cuda
4949
tasks_from: "{{ 'runtime.yml' if appliances_mode == 'configure' else 'install.yml' }}"
5050

51-
- name: Setup vGPU
52-
hosts: vgpu
53-
become: yes
54-
gather_facts: yes
55-
tags: vgpu
56-
tasks:
57-
- include_role:
58-
name: stackhpc.linux.vgpu
59-
tasks_from: "{{ 'configure.yml' if appliances_mode == 'configure' else 'install.yml' }}"
60-
handlers:
61-
- name: reboot
62-
fail:
63-
msg: Reboot handler for stackhpc.linux.vgpu role fired unexpectedly. This was supposed to be unreachable.
64-
6551
- name: Persist hostkeys across rebuilds
6652
# Must be after filesystems.yml (for storage)
6753
# and before portal.yml (where OOD login node hostkeys are scanned)

ansible/fatimage.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -250,16 +250,6 @@
250250
name: cloudalchemy.grafana
251251
tasks_from: install.yml
252252

253-
- name: Add support for NVIDIA GPU auto detection to Slurm
254-
hosts: cuda
255-
become: yes
256-
tasks:
257-
- name: Recompile slurm
258-
import_role:
259-
name: slurm_recompile
260-
vars:
261-
slurm_recompile_with_nvml: "{{ groups.cuda | length > 0 }}"
262-
263253
- name: Run post.yml hook
264254
vars:
265255
appliances_environment_root: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}"

ansible/roles/compute_init/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ it also requires an image build with the role name added to the
7575
| extras.yml | basic_users | All functionality [6] | No |
7676
| extras.yml | eessi | All functionality [7] | No |
7777
| extras.yml | cuda | None required - use image build | Yes [8] |
78-
| extras.yml | vgpu | All functionality | Yes |
7978
| extras.yml | persist_hostkeys | Not relevant for compute nodes | n/a |
8079
| extras.yml | compute_init (export) | Not relevant for compute nodes | n/a |
8180
| extras.yml | k9s (install) | Not relevant during boot | n/a |

ansible/roles/compute_init/files/compute-init.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
enable_basic_users: "{{ os_metadata.meta.basic_users | default(false) | bool }}"
2020
enable_eessi: "{{ os_metadata.meta.eessi | default(false) | bool }}"
2121
enable_chrony: "{{ os_metadata.meta.chrony | default(false) | bool }}"
22-
enable_vgpu: "{{ os_metadata.meta.vpgu | default(false) | bool }}"
2322
enable_nhc: "{{ os_metadata.meta.nhc | default(false) | bool }}"
2423

2524
# TODO: "= role defaults" - could be moved to a vars_file: on play with similar precedence effects
@@ -297,12 +296,6 @@
297296
cmd: "cvmfs_config setup"
298297
when: enable_eessi
299298

300-
- name: Configure VGPUs
301-
include_role:
302-
name: stackhpc.linux.vgpu
303-
tasks_from: 'configure.yml'
304-
when: enable_vgpu
305-
306299
# NB: don't need conditional block on enable_compute as have already exited
307300
# if not the case
308301
- name: Write Munge key

ansible/roles/cuda/tasks/facts.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

ansible/roles/slurm_recompile/README.md

Lines changed: 0 additions & 28 deletions
This file was deleted.

ansible/roles/slurm_recompile/defaults/main.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

ansible/roles/slurm_recompile/tasks/main.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)