Skip to content

Commit b4295a1

Browse files
committed
These changes upgrade the democluster to use slurm 23.11 and ubuntu noble 24.04.
* use linuxproc instead of cgroup * remove slurmrestd refs and update local script * add oidc-domain config for jobbergate and vantage agent snaps * add --enable to jobbergate and agent start
1 parent b481a1a commit b4295a1

File tree

6 files changed

+117
-862
lines changed

6 files changed

+117
-862
lines changed

democluster/democluster.pkr.hcl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ locals {
2929

3030
variable "ubuntu_series" {
3131
type = string
32-
default = "jammy"
32+
default = "noble"
3333
description = "The codename of the Ubuntu series to build."
3434
}
3535

@@ -69,8 +69,8 @@ source "qemu" "stage0" {
6969
["-cpu", "${lookup(local.qemu_cpu, var.architecture, "")}"],
7070
["-serial", "stdio"],
7171
["-device", "virtio-gpu-pci"],
72-
["-drive", "if=pflash,format=raw,id=ovmf_code,readonly=on,file=/usr/share/${lookup(local.uefi_imp, var.architecture, "")}/${lookup(local.uefi_imp, var.architecture, "")}_CODE.fd"],
73-
["-drive", "if=pflash,format=raw,id=ovmf_vars,file=${lookup(local.uefi_imp, var.architecture, "")}_VARS.fd"],
72+
["-drive", "if=pflash,format=raw,id=ovmf_code,readonly=on,file=/usr/share/OVMF/OVMF_CODE_4M.fd"],
73+
["-drive", "if=pflash,format=raw,id=ovmf_vars,file=/usr/share/OVMF/OVMF_VARS_4M.fd"],
7474
["-drive", "file=seeds-cloudimg.iso,format=raw"],
7575
["-drive", "file=output-stage0/packer-stage0,format=qcow2"]
7676
]
@@ -86,7 +86,7 @@ build {
8686

8787
provisioner "shell-local" {
8888
inline = [
89-
"cp /usr/share/${lookup(local.uefi_imp, var.architecture, "")}/${lookup(local.uefi_imp, var.architecture, "")}_VARS.fd ${lookup(local.uefi_imp, var.architecture, "")}_VARS.fd",
89+
"cp /usr/share/OVMF/OVMF_VARS_4M.fd OVMF_VARS_4M.fd",
9090
"cloud-localds seeds-cloudimg.iso user-data meta-data"
9191
]
9292
inline_shebang = "/bin/bash -e"

democluster/helpers/deploy_local_democluster.sh

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
CLIENT_ID=$1
44
CLIENT_SECRET=$2
5+
BASE_API_URL="https://apis.vantagecompute.ai"
6+
OIDC_DOMAIN="auth.vantagecompute.ai/realms/vantage"
57

68
cat <<EOF > /tmp/cloud-init.yaml
79
#cloud-config
@@ -30,13 +32,26 @@ runcmd:
3032
sed -i "s|@CLIENT_ID@|$CLIENT_ID|g" /srv/jobbergate-agent-venv/.env
3133
sed -i "s|@CLIENT_SECRET@|$CLIENT_SECRET|g" /srv/jobbergate-agent-venv/.env
3234
- |
33-
- systemctl start slurmrestd
3435
- systemctl restart slurmdbd
35-
- systemctl restart slurmd
3636
- sleep 30
3737
- systemctl restart slurmctld
38+
- systemctl restart slurmd
3839
- scontrol update NodeName=\$(hostname) State=RESUME
39-
- systemctl start jobbergate-agent
40+
41+
- snap set vantage-agent base-api-url=$BASE_API_URL
42+
- snap set vantage-agent oidc-client-id=$CLIENT_ID
43+
- snap set vantage-agent oidc-client-secret=$CLIENT_SECRET
44+
- snap set vantage-agent oidc-domain=$OIDC_DOMAIN
45+
- snap set vantage-agent task-jobs-interval-seconds=30
46+
- snap set jobbergate-agent base-api-url=$BASE_API_URL
47+
- snap set jobbergate-agent oidc-client-id=$CLIENT_ID
48+
- snap set jobbergate-agent oidc-client-secret=$CLIENT_SECRET
49+
- snap set jobbergate-agent oidc-domain=$OIDC_DOMAIN
50+
- snap set jobbergate-agent task-jobs-interval-seconds=30
51+
- snap set jobbergate-agent x-slurm-user-name=ubuntu
52+
- snap set jobbergate-agent influx-dsn=influxdb://slurm:rats@localhost:8086/slurm-job-metrics
53+
- snap start vantage-agent.start --enable
54+
- snap start jobbergate-agent.start --enable
4055
EOF
4156

4257
mkdir -p $HOME/democluster

0 commit comments

Comments
 (0)