reconfigure ood code-server app

Author: bertiethorpe

ansible/roles/openondemand/defaults/main.yml

@@ -103,3 +103,5 @@ openondemand_osc_ood_defaults:
   oidc_uri: "{{ openondemand_auth_defaults.oidc.oidc_uri if (openondemand_auth | lower) == 'oidc' else none }}"
   ood_auth_openidc: "{{ openondemand_auth_defaults.oidc.ood_auth_openidc if (openondemand_auth | lower) == 'oidc' else none }}"
   httpd_auth: "{{ openondemand_auth_defaults[openondemand_auth | lower].httpd_auth }}"
+
+code_server_version: 4.102.2

ansible/roles/openondemand/tasks/codeserver_compute.yml

@@ -1,18 +1,40 @@
-- name: Download code-server binary
-  get_url:
-    url: "https://github.com/coder/code-server/releases/download/v4.22.1/code-server-4.22.1-linux-amd64.tar.gz"
-    dest: "/tmp/code-server.tar.gz"
+- name: Download Code Server RPM
+  ansible.builtin.get_url:
+    url: "https://github.com/coder/code-server/releases/download/v{{ code_server_version }}/code-server-{{ code_server_version }}-amd64.rpm"
+    dest: /tmp/code-server.rpm
     mode: '0644'
 
-- name: Extract code-server binary
-  unarchive:
-    src: "/tmp/code-server.tar.gz"
-    dest: "/opt/"
-    remote_src: yes
+- name: Install Code Server
+  ansible.builtin.dnf:
+    name: /tmp/code-server.rpm
+    state: present
+    disable_gpg_check: yes
 
-- name: Symlink code-server to /usr/local/bin
-  file:
-    src: "/opt/code-server-4.22.1-linux-amd64/bin/code-server"
-    dest: "/usr/local/bin/code-server"
-    state: link
-    force: yes
+- name: Create module directory for Code Server
+  ansible.builtin.file:
+    path: /opt/ohpc/pub/modulefiles/code-server
+    state: directory
+    mode: '0755'
+    recurse: yes
+
+- name: Create modulefile for code-server
+  copy:
+    dest: "/opt/ohpc/pub/modulefiles/code-server/{{ code_server_version }}"
+    mode: "0644"
+    content: |
+      #%Module1.0#####################################################################
+
+      proc ModulesHelp { } {
+          puts stderr "This module loads code-server {{ code_server_version }}."
+          puts stderr "VS Code in the browser. Visit http://127.0.0.1:8080"
+      }
+
+      module-whatis "Name: code-server"
+      module-whatis "Version: {{ code_server_version }}"
+      module-whatis "Category: IDE"
+      module-whatis "Description: Run VS Code in your browser with code-server"
+      module-whatis "URL: https://github.com/coder/code-server"
+
+      set root /usr/bin/code-server
+
+      prepend-path PATH $root

ansible/roles/openondemand/tasks/rstudio_compute.yml

@@ -2,26 +2,50 @@
 # See https://osc.github.io/ood-documentation/latest/tutorials/tutorials-interactive-apps/add-rstudio.html
 # - Will already have lmod
 
-- name: Install EPEL and dependencies
-  ansible.builtin.yum:
-    name:
-      - epel-release
-      - R
+- name: Install R from EPEL
+  ansible.builtin.dnf:
+    name: R
     state: present
 
 - name: Download RStudio Server RPM
   ansible.builtin.get_url:
-    url: https://download2.rstudio.org/server/centos8/x86_64/rstudio-server-rhel-2023.12.1-402-x86_64.rpm
+    url: "https://download2.rstudio.org/server/rhel{{ ansible_distribution_major_version }}/x86_64/rstudio-server-rhel-2025.05.1-513-x86_64.rpm"
     dest: /tmp/rstudio-server.rpm
     mode: '0644'
 
 - name: Install RStudio Server
-  ansible.builtin.yum:
+  ansible.builtin.dnf:
     name: /tmp/rstudio-server.rpm
     state: present
+    disable_gpg_check: yes
 
-- name: Ensure rstudio-server service is disabled and stopped
-  ansible.builtin.service:
-    name: rstudio-server
-    enabled: false
-    state: stopped
+- name: Create module directory for RStudio Server
+  ansible.builtin.file:
+    path: /opt/ohpc/pub/modulefiles/rstudio-server
+    state: directory
+    mode: '0755'
+    recurse: yes
+
+- name: Write modulefile for RStudio Server
+  ansible.builtin.copy:
+    dest: /opt/ohpc/pub/modulefiles/rstudio-server/2025.05.1
+    mode: '0644'
+    content: |
+      #%Module1.0#####################################################################
+
+      proc ModulesHelp { } {
+          puts stderr " "
+          puts stderr "This module loads RStudio Server 2025.05.1"
+          puts stderr "\nRStudio Server provides a browser-based interface to R.\n"
+      }
+
+      module-whatis "Name: rstudio-server"
+      module-whatis "Version: 2025.05.1"
+      module-whatis "Category: IDE"
+      module-whatis "Description: RStudio Server - IDE for R"
+      module-whatis "URL: https://www.rstudio.com"
+
+      set version 2025.05.1
+      set root /usr/lib/rstudio-server
+
+      prepend-path PATH $root/bin

environments/common/inventory/group_vars/all/openondemand.yml

@@ -194,12 +194,10 @@ openondemand_apps_rstudio_default:
       label: RStudio module
       required: true
       cachable: true
-      help: Choose your RStudio module - 2023.09 is only for el8 partitions
+      help: Choose your RStudio module
       widget: select
       options:
-        - ["RStudio-Server/2022.07.2+576-foss-2022a-Java-11-R-4.2.1", "RStudio-Server/2022.07.2+576-foss-2022a-Java-11-R-4.2.1"]
-        - ["RStudio-Server/1.4.1717-foss-2021a-Java-11-R-4.1.0", "RStudio-Server/1.4.1717-foss-2021a-Java-11-R-4.1.0"]
-        - ["RStudio-Server/2023.09.1+494-foss-2023a-Java-11-R-4.3.2", "RStudio-Server/2023.09.1+494-foss-2023a-Java-11-R-4.3.2"]
+        - ["rstudio-server/2025.05.1","rstudio-server/2025.05.1"]
     extra_modules_script:
       label: Extra modules script
       help: If you'd like to load additional modules alongside RStudio-Server, put the 'module load ...' commands into a text file (one 'module load...' per line) and specify its path here
@@ -297,21 +295,51 @@ openondemand_apps_matlab_default:
 openondemand_apps_matlab: "{{ {'matlab':openondemand_apps_matlab_default} if openondemand_matlab_partition | default(none) else {} }}"
 
 openondemand_apps_codeserver_default:
-  title: Codeserver
-  description: Request a Codeserver
+  title: Code Server
+  description: Request a Code Server
   cluster: slurm
   form:
     - bc_queue
     - bc_num_hours
-    - num_cores
-    - node
-  attributes: # TODO
-    num_cores:
-      label: Number of cores FOO
-      value: 1
+    - codeserver_module
+    - cores
+    - ram
+  attributes:
+    codeserver_module:
+      label: Code Server module
+      required: true
+      cachable: true
+      help: Choose your Code Server module
+      widget: select
+      options:
+        - ["code-server/4.102.2","code-server/4.102.2"]
     bc_queue:
       value: "{{ openondemand_codeserver_partition | default(none) }}"
-    node: ""
+    cores:
+      label: Number of CPU cores
+      help: How many CPU cores to reserve for your session. NB Ensure this is within the maximum allowed by your chosen partition.
+      widget: number_field
+      min: 1
+      max: 48
+      step: 1
+      value: 1
+      cachable: true
+    ram:
+      widget: number_field
+      label: RAM in GB
+      help: How much RAM to reserve for your session. NB Ensure this is within the maximum allowed by your chosen partition
+      min: 4
+      max:  700
+      step: 1
+      value: 4
+      cachable: true
+    bc_num_hours:
+      widget: number_field
+      help: Maximum runtime in hours for your session. NB Ensure this is within the maximum allowed by your chosen partition
+      min: 1
+      max: 240
+      step: 1
+      value: 30
   submit: |
     ---
     batch_connect:
@@ -321,9 +349,14 @@ openondemand_apps_codeserver_default:
     script:
       job_name: "ood-codeserver"
       native:
-        - <%= "--nodes=1" %>
-        - <%= "--ntasks=#{num_cores}" %>
-        - <%= "--nodelist=#{node}" %>
+        - "--partition"
+        - "<%= bc_queue %>"
+        - "--ntasks"
+        - "1"
+        - "--mem"
+        - "<%= ram.blank? ? 4 : ram.to_i %>G"
+        - "--cpus-per-task"
+        - "<%= cores.blank? ? 1 : cores.to_i %>"
 openondemand_apps_codeserver: "{{ {'codeserver':openondemand_apps_codeserver_default} if openondemand_codeserver_partition | default(none) else {} }}"
 
 # osc.ood:ood_apps - see https://github.com/OSC/ood-ansible#ood_apps