Merge pull request #21 from omnivector-solutions/matheushent/PENG-237…

…2--agents-from-snap

PENG-2372  install agents from the Snap Store

democluster/CHANGELOG.rst

@@ -7,6 +7,13 @@ Tracking of all notable changes to the Demo Cluster image.
 Unreleased
 ----------
 
+0.3.0 - 2024-11-13
+------------------
+
+- Install the Jobbergate Agent and the Vantage Agent from the Snap Store in classic mode (`PENG-2372`_).
+
+.. _PENG-2372: https://app.clickup.com/t/18022949/PENG-2372
+
 0.2.0 - 2023-09-20
 ------------------
 

democluster/user-data

@@ -70,7 +70,6 @@ write_files:
     =cs1s
     -----END PGP PUBLIC KEY BLOCK-----
 
-
 - path: /var/lib/slurm/slurmctld/jwt_hs256.key
   owner: root:root
   permissions: '0600'
@@ -276,7 +275,6 @@ write_files:
     PurgeTXNAfter="12month"
     PurgeUsageAfter="24month"
 
-
 users:
 - name: root
   lock_passwd: false
@@ -292,8 +290,8 @@ system_info:
     shell: /bin/bash
     lock_passwd: false
     gecos: Ubuntu
-    groups: [adm, cdrom, dip, lxd, sudo]
-    sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+    groups: [ adm, cdrom, dip, lxd, sudo ]
+    sudo: [ "ALL=(ALL) NOPASSWD:ALL" ]
 ssh_pwauth: True
 disable_root: false
 preserve_hostname: true
@@ -319,6 +317,12 @@ packages:
 - mpich
 - python3-venv
 - apptainer
+
+snap:
+  commands:
+    0: snap install vantage-agent --channel=stable --classic
+    1: snap install jobbergate-agent --channel=stable --classic
+
 bootcmd:
 - mkdir /run/packer_backup
 - mkdir /run/packer_backup/etc
@@ -390,38 +394,3 @@ runcmd:
   EOF
 
 - systemctl daemon-reload
-
-# create agents' venv
-- /usr/bin/python3 -m venv /srv/jobbergate-agent-venv
-- /srv/jobbergate-agent-venv/bin/pip install -U pip
-- /srv/jobbergate-agent-venv/bin/pip install jobbergate-agent
-- |
-  cat <<EOF > /srv/jobbergate-agent-venv/.env
-  JOBBERGATE_AGENT_X_SLURM_USER_NAME=root
-  JOBBERGATE_AGENT_BASE_API_URL=https://apis.@ENVIRONMENT@vantagehpc.io
-  JOBBERGATE_AGENT_OIDC_DOMAIN=auth.@ENVIRONMENT@vantagehpc.io/realms/vantage
-  JOBBERGATE_AGENT_OIDC_AUDIENCE=https://apis.vantagehpc.io
-  JOBBERGATE_AGENT_OIDC_CLIENT_ID=@CLIENT_ID@
-  JOBBERGATE_AGENT_OIDC_CLIENT_SECRET=@CLIENT_SECRET@
-  JOBBERGATE_AGENT_TASK_JOBS_INTERVAL_SECONDS=30
-  JOBBERGATE_AGENT_TASK_SELF_UPDATE_INTERVAL_SECONDS=30
-  EOF
-  chown root:root /srv/jobbergate-agent-venv/.env
-  chmod 0644 /srv/jobbergate-agent-venv/.env
-
-- /usr/bin/python3 -m venv /srv/vantage-agent-venv
-- /srv/vantage-agent-venv/bin/pip install -U pip
-- /srv/vantage-agent-venv/bin/pip install vantage-agent
-- |
-  cat <<EOF > /srv/vantage-agent-venv/.env
-  VANTAGE_AGENT_BASE_API_URL=https://apis.@ENVIRONMENT@vantagehpc.io
-  VANTAGE_AGENT_OIDC_DOMAIN=auth.@ENVIRONMENT@vantagehpc.io/realms/vantage
-  VANTAGE_AGENT_OIDC_CLIENT_ID=@CLIENT_ID@
-  VANTAGE_AGENT_OIDC_CLIENT_SECRET=@CLIENT_SECRET@
-  VANTAGE_AGENT_TASK_JOBS_INTERVAL_SECONDS=30
-  VANTAGE_AGENT_TASK_SELF_UPDATE_INTERVAL_SECONDS=30
-  EOF
-  chown root:root /srv/vantage-agent-venv/.env
-  chmod 0644 /srv/vantage-agent-venv/.env
-
-- systemctl daemon-reload

public-scripts/deploy-democluster.sh

@@ -62,9 +62,11 @@ launch_instance () {
 
   # Set the environment to the empty string if not supplied
   if [ -z $ENV ]; then
-      ENVIRONMENT=""
+      BASE_API_URL="https://apis.vantagehpc.io"
+      OIDC_DOMAIN="auth.vantagehpc.io/realms/vantage"
   else
-      ENVIRONMENT="${ENV}."
+      BASE_API_URL="https://apis.${ENV}.vantagehpc.io"
+      OIDC_DOMAIN="auth.${ENV}.vantagehpc.io/realms/vantage"
   fi
 
   # Create the cloud-init file and launch the demo cluster instance.
@@ -91,34 +93,27 @@ runcmd:
 
     REAL_MEMORY=\$(free -m | grep -oP '\\d+' | head -n 1)
     sed -i "s|@REAL_MEMORY@|\$REAL_MEMORY|g" /etc/slurm/slurm.conf
-  - |
-    sed -i "s|@CLIENT_ID@|$CLIENT_ID|g" /srv/jobbergate-agent-venv/.env
-    sed -i "s|@CLIENT_SECRET@|$CLIENT_SECRET|g" /srv/jobbergate-agent-venv/.env
-    sed -i "s|@ENVIRONMENT@|$ENVIRONMENT|g" /srv/jobbergate-agent-venv/.env
-  - |
-    sed -i "s|@CLIENT_ID@|$CLIENT_ID|g" /srv/vantage-agent-venv/.env
-    sed -i "s|@CLIENT_SECRET@|$CLIENT_SECRET|g" /srv/vantage-agent-venv/.env
-    sed -i "s|@ENVIRONMENT@|$ENVIRONMENT|g" /srv/vantage-agent-venv/.env
   - systemctl start slurmrestd
   - systemctl restart slurmdbd
   - systemctl restart slurmd
   - sleep 30
   - systemctl restart slurmctld
   - scontrol update NodeName=\$(hostname) State=RESUME
-  - systemctl start jobbergate-agent
-  - systemctl start vantage-agent
+  - snap set vantage-agent base-api-url=$BASE_API_URL
+  - snap set vantage-agent oidc-client-id=$CLIENT_ID
+  - snap set vantage-agent oidc-client-secret=$CLIENT_SECRET
+  - snap set vantage-agent task-jobs-interval-seconds=30
+  - snap set vantage-agent task-self-update-interval-seconds=30
+  - snap set jobbergate-agent base-api-url=$BASE_API_URL
+  - snap set jobbergate-agent oidc-client-id=$CLIENT_ID
+  - snap set jobbergate-agent oidc-client-secret=$CLIENT_SECRET
+  - snap set jobbergate-agent task-jobs-interval-seconds=30
+  - snap set jobbergate-agent task-self-update-interval-seconds=30
+  - snap set jobbergate-agent x-slurm-user-name=root
+  - snap start vantage-agent.start
+  - snap start jobbergate-agent.start
 EOF
 
-  if ! [ -z "${JG_VERSION}" ]; then
-      echo "  - systemctl stop jobbergate-agent" >> /tmp/cloud-init.yaml
-      echo "  - /srv/jobbergate-agent-venv/bin/pip install -U jobbergate-agent==$JG_VERSION" >> /tmp/cloud-init.yaml
-      echo "  - systemctl start jobbergate-agent" >> /tmp/cloud-init.yaml
-  fi
-  if ! [ -z "${VTG_VERSION}" ]; then
-      echo "  - systemctl stop vantage-agent" >> /tmp/cloud-init.yaml
-      echo "  - /srv/vantage-agent-venv/bin/pip install -U vantage-agent==$VTG_VERSION" >> /tmp/cloud-init.yaml
-      echo "  - systemctl start vantage-agent" >> /tmp/cloud-init.yaml
-  fi
   mkdir -p $HOME/democluster/tmp
 
   cat /tmp/cloud-init.yaml | multipass launch -c$(nproc) \