Merge branch 'main' into feat/config-drive

wtripp180901 · web-flow · commit a2fbb5c3ad00 · 2025-08-12T11:46:27.000+01:00
diff --git a/ansible/portal.yml b/ansible/portal.yml
@@ -13,10 +13,11 @@
         name: openondemand
         tasks_from: main.yml
 
-- hosts: openondemand_desktop
+- hosts: openondemand_desktop:openondemand_matlab
   tags:
     - openondemand
     - openondemand_desktop
+    - openondemand_matlab
   become: yes
   gather_facts: yes
   tasks:
@@ -36,3 +37,27 @@
         name: openondemand
         tasks_from: jupyter_compute.yml
       when: appliances_mode != 'configure' # is run during build
+
+- hosts: openondemand_rstudio
+  tags:
+    - openondemand
+    - openondemand_rstudio
+  become: yes
+  gather_facts: yes
+  tasks:
+    - import_role:
+        name: openondemand
+        tasks_from: rstudio_compute.yml
+      when: appliances_mode != 'configure' # is run during build
+
+- hosts: openondemand_codeserver
+  tags:
+    - openondemand
+    - openondemand_codeserver
+  become: yes
+  gather_facts: yes
+  tasks:
+    - import_role:
+        name: openondemand
+        tasks_from: codeserver_compute.yml
+      when: appliances_mode != 'configure' # is run during build
diff --git a/ansible/roles/lustre/defaults/main.yml b/ansible/roles/lustre/defaults/main.yml
@@ -6,7 +6,7 @@ lustre_mount_state: mounted
 lustre_mount_options: 'defaults,_netdev,noauto,x-systemd.automount,x-systemd.requires=lnet.service,nosuid,nodev'
 
 # below variables are for build and should not generally require changes
-lustre_repo: "git://git.whamcloud.com/fs/lustre-release.git"
+lustre_repo: "https://github.com/lustre/lustre-release.git"
 lustre_build_packages:
   - "kernel-devel-{{ ansible_kernel }}"
   - git
diff --git a/ansible/roles/openondemand/defaults/main.yml b/ansible/roles/openondemand/defaults/main.yml
@@ -24,6 +24,9 @@ openondemand_desktop_screensaver: false
 openondemand_filesapp_paths: []
 openondemand_jupyter_partition: ''
 openondemand_dashboard_links: []
+openondemand_rstudio_partition: ''
+openondemand_matlab_partition: ''
+openondemand_codeserver_partition: ''
 
 # Monitoring:
 openondemand_exporter: true
@@ -100,3 +103,7 @@ 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 }}"
+
+openondemand_code_server_version: 4.102.2
+openondemand_rstudio_version: 2025.05.1-513
+openondemand_matlab_version: ''
diff --git a/ansible/roles/openondemand/tasks/codeserver_compute.yml b/ansible/roles/openondemand/tasks/codeserver_compute.yml
@@ -0,0 +1,40 @@
+- name: Download Code Server RPM
+  ansible.builtin.get_url:
+    url: "https://github.com/coder/code-server/releases/download/v{{ openondemand_code_server_version }}/code-server-{{ openondemand_code_server_version }}-amd64.rpm"
+    dest: /tmp/code-server.rpm
+    mode: '0644'
+
+- name: Install Code Server
+  ansible.builtin.dnf:
+    name: /tmp/code-server.rpm
+    state: present
+    disable_gpg_check: 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/{{ openondemand_code_server_version }}"
+    mode: "0644"
+    content: |
+      #%Module1.0#####################################################################
+
+      proc ModulesHelp { } {
+          puts stderr "This module loads code-server {{ openondemand_code_server_version }}."
+          puts stderr "\nCode Server provides a browser-based VSCode instance.\n"
+      }
+
+      module-whatis "Name: code-server"
+      module-whatis "Version: {{ openondemand_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
diff --git a/ansible/roles/openondemand/tasks/rstudio_compute.yml b/ansible/roles/openondemand/tasks/rstudio_compute.yml
@@ -0,0 +1,50 @@
+# Should be run on compute nodes you want to run RStudio on
+# See https://osc.github.io/ood-documentation/latest/tutorials/tutorials-interactive-apps/add-rstudio.html
+# - Will already have lmod
+
+- 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/rhel{{ ansible_distribution_major_version }}/x86_64/rstudio-server-rhel-{{ openondemand_rstudio_version }}-x86_64.rpm"
+    dest: /tmp/rstudio-server.rpm
+    mode: '0644'
+
+- name: Install RStudio Server
+  ansible.builtin.dnf:
+    name: /tmp/rstudio-server.rpm
+    state: present
+    disable_gpg_check: yes
+
+- 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/{{ openondemand_rstudio_version }}"
+    mode: '0644'
+    content: |
+      #%Module1.0#####################################################################
+
+      proc ModulesHelp { } {
+          puts stderr " "
+          puts stderr "This module loads RStudio Server {{ openondemand_rstudio_version }}"
+          puts stderr "\nRStudio Server provides a browser-based interface to R.\n"
+      }
+
+      module-whatis "Name: rstudio-server"
+      module-whatis "Version: {{ openondemand_rstudio_version }}"
+      module-whatis "Category: IDE"
+      module-whatis "Description: RStudio Server - IDE for R"
+      module-whatis "URL: https://www.rstudio.com"
+
+      set root /usr/lib/rstudio-server
+
+      prepend-path PATH $root/bin
diff --git a/docs/openondemand.md b/docs/openondemand.md
@@ -22,10 +22,17 @@ For examples of all of the above see the `smslabs-example` environment in this r
 # Enabling Open OnDemand
 To enable the Open OnDemand server, add single host to the `openondemand` inventory group. Generally, this should be a node in the `login` group, as Open OnDemand must be able to access Slurm commands.
 
-To enable compute nodes for virtual desktops or Jupyter notebook servers (accessed through the Open OnDemand portal), add nodes/groups to the `openondemand_desktop` and `openondemand_jupyter` inventory groups respectively. These may be all or a subset of the `compute` group.
+To enable compute nodes for virtual desktops, Jupyter notebooks, RStudio, VSCode, or MATLAB (accessed through the Open OnDemand portal), add nodes/groups to the `openondemand_desktop`, `openondemand_jupyter`, `openondemand_rstudio`, `openondemand_codeserver`, and `openondemand_matlab` inventory groups respectively. These may be all or a subset of the `compute` group.
 
 The above functionality is configured by running the `ansible/portal.yml` playbook. This is automatically run as part of `ansible/site.yml`.
 
+## MATLAB
+*NB* Due to licensing, the MATLAB batch connect app requires a MATLAB intallation to be present on the relevant compute nodes. The MATLAB app is therefore disabled by default, and must be enabled by setting `openondemand_matlab_partition` in e.g. `environments/site/inventory/group_vars/all/openondemand.yml` to the name of the partition where MATLAB is available.
+
+An Lmod modulefile also needs to be available on compute nodes - this is not provided by the appliance. See e.g.`roles/openondemand/tasks/rstudio_compute.yml` for an example. The modulefile must be named `matlab/$MATLAB_VERSION`, where the version matches thes `openondemand_matlab_version` variable. This variable is set to empty in the role default so must be defined in `environments/site/inventory/group_vars/all/openondemand.yml`.
+
+As MATLAB requires a remote desktop, the TurboVNC and Xfce Desktop packages and configuration from the  "openondemand_desktop" app will be automatically applied to nodes where the MATLAB app is enabled.
+
 # Default configuration
 
 See the [ansible/roles/openondemand/README.md](../ansible/roles/openondemand/README.md) for more details on the variables described below.
@@ -39,7 +46,7 @@ The following variables have been given default values to allow Open OnDemand to
   self-signed certificate is generated, which should probably be replaced for
   production environments.
 - `openondemand_auth` and any corresponding options. Defaults to `basic_pam`.
-- `openondemand_desktop_partition` and `openondemand_jupyter_partition` if the corresponding inventory groups are defined. Defaults to the first compute group defined in the `compute` OpenTofu variable in `environments/$ENV/tofu`.
+- `openondemand_desktop_partition`, `openondemand_jupyter_partition`, `openondemand_rstudio_partition`, and `openondemand_codeserver_partition` if the corresponding inventory groups are defined. Defaults to the first compute group defined in the `compute` OpenTofu variable in `environments/$ENV/tofu`. Note `openondemand_matlab_partition` is not set due to the additional requirements discussed above.
 
 It is also recommended to set:
 - `openondemand_dashboard_support_url`
diff --git a/environments/.stackhpc/inventory/group_vars/all/openondemand.yml b/environments/.stackhpc/inventory/group_vars/all/openondemand.yml
@@ -1,6 +1,8 @@
 openondemand_auth: basic_pam
 openondemand_jupyter_partition: standard
 openondemand_desktop_partition: standard
+openondemand_rstudio_partition: standard
+openondemand_codeserver_partition: standard
 #openondemand_dashboard_support_url: 
 #openondemand_dashboard_docs_url:
 #openondemand_filesapp_paths:
diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json
@@ -1,6 +1,6 @@
 {
     "cluster_image": {
-        "RL8": "openhpc-RL8-250805-1410-35724c15",
-        "RL9": "openhpc-RL9-250805-1409-35724c15"
+        "RL8": "openhpc-RL8-250808-1727-faa44755",
+        "RL9": "openhpc-RL9-250808-1727-faa44755"
     }
 }
diff --git a/environments/common/inventory/group_vars/all/openhpc.yml b/environments/common/inventory/group_vars/all/openhpc.yml
@@ -51,31 +51,36 @@ openhpc_state_save_location: "{{ appliances_state_dir + '/slurmctld' if applianc
 # NB: override in environments/site/inventory/group_vars/all/openhpc.yml, not here:
 openhpc_config_extra: {}
 
-# default additional slurm.conf parameters for the appliance:
+# additional default slurm.conf parameters for the appliance:
 openhpc_config_default:
   TaskPlugin: task/cgroup,task/affinity
   ReturnToService: 2 # workaround for templating bug TODO: Remove once on stackhpc.openhpc v1.2.0
-  TopologyPlugin: "topology/{{ 'tree' if (topology_nodes | length) > 0 else 'flat' }}"
 
-# default additional slurm.conf parameters when "rebuild" enabled:
+# additional default slurm.conf parameters when "rebuild" enabled:
 openhpc_config_rebuild:
   RebootProgram: /opt/slurm-tools/bin/slurm-openstack-rebuild
   SlurmctldParameters:
     - reboot_from_controller
   ResumeTimeout: 300
 
-# default additional slurm.conf parameters when "nhc" enabled:
+# additional default slurm.conf parameters when "nhc" enabled:
 openhpc_config_nhc:
   HealthCheckProgram: /usr/sbin/nhc
   HealthCheckInterval: 300
   HealthCheckNodeState: NONDRAINED_IDLE
 
+# additional default slurm.conf parameters when "topology" enabled:
+openhpc_config_topology:
+  TopologyPlugin: topology/tree
+
 # indirection to allow automatic construction of slurm.conf parameters:
 openhpc_config_groups:
   - enabled: "{{ groups['rebuild'] | length > 0 }}"
     config: "{{ openhpc_config_rebuild }}"
   - enabled: "{{ groups['nhc'] | length > 0 }}"
     config: "{{ openhpc_config_nhc }}"
+  - enabled: "{{ groups['topology'] | length > 0 }}"
+    config: "{{ openhpc_config_topology }}"
   - enabled: true
     config: "{{ openhpc_config_extra }}"
 
diff --git a/environments/common/inventory/group_vars/all/openondemand.yml b/environments/common/inventory/group_vars/all/openondemand.yml
diff --git a/environments/common/inventory/groups b/environments/common/inventory/groups
diff --git a/environments/site/inventory/groups b/environments/site/inventory/groups
diff --git a/environments/site/tofu/login.tf b/environments/site/tofu/login.tf

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"cluster_image": {`
`3`		`- "RL8": "openhpc-RL8-250805-1410-35724c15",`
`4`		`- "RL9": "openhpc-RL9-250805-1409-35724c15"`
	`3`	`+ "RL8": "openhpc-RL8-250808-1727-faa44755",`
	`4`	`+ "RL9": "openhpc-RL9-250808-1727-faa44755"`
`5`	`5`	`}`
`6`	`6`	`}`