From 5fb5dafe4953792cc84e79f1133a176f7a1bcb8b Mon Sep 17 00:00:00 2001 From: George Chip Smith Date: Thu, 20 Feb 2025 16:30:18 -0800 Subject: [PATCH 1/3] New NFS filesystems to XFS --- ansible/roles/nfs_server/tasks/main.yml | 10 +++++----- ansible/roles/raid0/files/raid0.sh | 8 ++++---- ansible/roles/raid0/templates/raid0.mount | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ansible/roles/nfs_server/tasks/main.yml b/ansible/roles/nfs_server/tasks/main.yml index 3163b7e..9e76af7 100644 --- a/ansible/roles/nfs_server/tasks/main.yml +++ b/ansible/roles/nfs_server/tasks/main.yml @@ -5,10 +5,10 @@ when: item.mount == "/home" register: home_mount_exists -- name: Create a ext4 filesystem on /dev/vdb +- name: Create a xfs filesystem on /dev/vdb tags: nfs_server community.general.filesystem: - fstype: ext4 + fstype: xfs dev: /dev/vdb - name: Mount vdb to /mnt/home @@ -16,7 +16,7 @@ ansible.posix.mount: path: /mnt/home src: /dev/vdb - fstype: ext4 + fstype: xfs state: mounted when: home_mount_exists is skipped @@ -30,7 +30,7 @@ ansible.posix.mount: path: /mnt/home src: /dev/vdb - fstype: ext4 + fstype: xfs state: unmounted - name: Mount vdb to /home @@ -38,7 +38,7 @@ ansible.posix.mount: path: /home src: /dev/vdb - fstype: ext4 + fstype: xfs state: mounted - name: Install nfs-server diff --git a/ansible/roles/raid0/files/raid0.sh b/ansible/roles/raid0/files/raid0.sh index 10e7490..0a6f517 100644 --- a/ansible/roles/raid0/files/raid0.sh +++ b/ansible/roles/raid0/files/raid0.sh @@ -17,15 +17,15 @@ udevadm settle blkid -p -u filesystem /dev/md/ephemeral >> /dev/null res=$? if [ $res -eq 2 ]; then - echo "info: creating ext4 fs on md dev" - mkfs.ext4 /dev/md/ephemeral + echo "info: creating xfs fs on md dev" + mkfs.xfs /dev/md/ephemeral if [ $? -ne 0 ]; then - echo "error: failed to create ext4 fs on md dev" + echo "error: failed to create xfs fs on md dev" exit 1 fi elif [ $res -ne 0 ]; then echo "error: failed to probe fs on md dev" exit 1 else - echo "info: md dev is already formatted with an ext4 fs" + echo "info: md dev is already formatted with an xfs fs" fi diff --git a/ansible/roles/raid0/templates/raid0.mount b/ansible/roles/raid0/templates/raid0.mount index cf81b2f..47e91e7 100644 --- a/ansible/roles/raid0/templates/raid0.mount +++ b/ansible/roles/raid0/templates/raid0.mount @@ -5,7 +5,7 @@ After=raid0.service [Mount] What=/dev/md/ephemeral Where={{ raid0_mount_path }} -Type=ext4 +Type=xfs Options=defaults [Install] From 2a3059bad030277d6971b9d9244acf1d36ff2b96 Mon Sep 17 00:00:00 2001 From: Jonathan Lassoff Date: Tue, 25 Feb 2025 12:44:11 -0800 Subject: [PATCH 2/3] Anonymize example SSH keys --- README.md | 6 +++--- examples/h100-80gb-sxm-ib.tfvars | 6 +++--- examples/l40s-48gb.tfvars | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 565d327..98d7b3e 100644 --- a/README.md +++ b/README.md @@ -89,15 +89,15 @@ additional users `user1`, `user2`, and `user3` to the slurm cluster. slurm_users = [{ name = "user1" uid = 1001 - ssh_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjPRr0iVR4mgzJy0ehnM5hWX4O86hM1bVTgdi5g3nkZ user1@crusoe.ai" + ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user1@crusoe.ai" }, { name = "user2" uid = 1002 - ssh_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjPRr0iVR4mgzJy0ehnM5hWX4O86hM1bVTgdi5g3nkZ user2@crusoe.ai" + ssh_pubkey = "ssh-ed25519 uAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ser2@crusoe.ai" }, { name = "user3" uid = 1003 - ssh_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjPRr0iVR4mgzJy0ehnM5hWX4O86hM1bVTgdi5g3nkZ user3@crusoe.ai" + ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user3@crusoe.ai" }] ``` diff --git a/examples/h100-80gb-sxm-ib.tfvars b/examples/h100-80gb-sxm-ib.tfvars index c0e2795..6b6f45a 100644 --- a/examples/h100-80gb-sxm-ib.tfvars +++ b/examples/h100-80gb-sxm-ib.tfvars @@ -13,13 +13,13 @@ slurm_compute_node_count = 4 slurm_users = [{ name = "user1" uid = 1001 - ssh_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjPRr0iVR4mgzJy0ehnM5hWX4O86hM1bVTgdi5g3nkZ user1@crusoe.ai" + ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user1@crusoe.ai" }, { name = "user2" uid = 1002 - ssh_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjPRr0iVR4mgzJy0ehnM5hWX4O86hM1bVTgdi5g3nkZ user2@crusoe.ai" + ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user2@crusoe.ai" }, { name = "user3" uid = 1003 - ssh_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjPRr0iVR4mgzJy0ehnM5hWX4O86hM1bVTgdi5g3nkZ user3@crusoe.ai" + ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user3@crusoe.ai" }] diff --git a/examples/l40s-48gb.tfvars b/examples/l40s-48gb.tfvars index de9fde4..dc4c506 100644 --- a/examples/l40s-48gb.tfvars +++ b/examples/l40s-48gb.tfvars @@ -12,13 +12,13 @@ slurm_compute_node_count = 4 slurm_users = [{ name = "user1" uid = 1001 - ssh_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjPRr0iVR4mgzJy0ehnM5hWX4O86hM1bVTgdi5g3nkZ user1@crusoe.ai" + ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user1@crusoe.ai" }, { name = "user2" uid = 1002 - ssh_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjPRr0iVR4mgzJy0ehnM5hWX4O86hM1bVTgdi5g3nkZ user2@crusoe.ai" + ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user2@crusoe.ai" }, { name = "user3" uid = 1003 - ssh_pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjPRr0iVR4mgzJy0ehnM5hWX4O86hM1bVTgdi5g3nkZ user3@crusoe.ai" + ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user3@crusoe.ai" }] From 8067003d402ed40d51826b49d26046d5864558ab Mon Sep 17 00:00:00 2001 From: Jonathan Lassoff Date: Tue, 25 Feb 2025 13:08:29 -0800 Subject: [PATCH 3/3] slurm: add `crusoe-team` by default --- examples/h100-80gb-sxm-ib.tfvars | 20 +++++++------------- examples/l40s-48gb.tfvars | 20 +++++++------------- variables.tf | 8 +++++++- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/examples/h100-80gb-sxm-ib.tfvars b/examples/h100-80gb-sxm-ib.tfvars index 6b6f45a..67acd24 100644 --- a/examples/h100-80gb-sxm-ib.tfvars +++ b/examples/h100-80gb-sxm-ib.tfvars @@ -10,16 +10,10 @@ slurm_compute_node_ib_network_id = "474dbfe2-ffb3-44ce-87a4-cea659fddea3" slurm_compute_node_count = 4 # slurm users configuration -slurm_users = [{ - name = "user1" - uid = 1001 - ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user1@crusoe.ai" -}, { - name = "user2" - uid = 1002 - ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user2@crusoe.ai" -}, { - name = "user3" - uid = 1003 - ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user3@crusoe.ai" -}] +slurm_users = [ + { + name = "crusoe-admin" + uid = 75123 + ssh_pubkey = "from=\"35.232.249.237\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM//Zq9sHLhFsP1gPZ+NuiUh8/4Vh5SVtISEKtz+c4el admin@managed-slurm-bastion-prod" + } +] diff --git a/examples/l40s-48gb.tfvars b/examples/l40s-48gb.tfvars index dc4c506..ae3a83d 100644 --- a/examples/l40s-48gb.tfvars +++ b/examples/l40s-48gb.tfvars @@ -9,16 +9,10 @@ slurm_compute_node_type = "l40s-48gb.10x" slurm_compute_node_count = 4 # slurm users configuration -slurm_users = [{ - name = "user1" - uid = 1001 - ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user1@crusoe.ai" -}, { - name = "user2" - uid = 1002 - ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user2@crusoe.ai" -}, { - name = "user3" - uid = 1003 - ssh_pubkey = "ssh-ed25519 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA user3@crusoe.ai" -}] +slurm_users = [ + { + name = "crusoe-admin" + uid = 75123 + ssh_pubkey = "from=\"35.232.249.237\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM//Zq9sHLhFsP1gPZ+NuiUh8/4Vh5SVtISEKtz+c4el admin@managed-slurm-bastion-prod" + } +] diff --git a/variables.tf b/variables.tf index 7be15e8..aac36a5 100644 --- a/variables.tf +++ b/variables.tf @@ -124,7 +124,13 @@ variable "slurm_users" { uid = number ssh_pubkey = string })) - default = [] + default = [ + { + name = "crusoe-admin" + uid = 75123 + ssh_pubkey = "from=\"35.232.249.237\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM//Zq9sHLhFsP1gPZ+NuiUh8/4Vh5SVtISEKtz+c4el admin@managed-slurm-bastion-prod" + } + ] } variable "partitions" {