Add MATLAB ood app configuration

Author: bertiethorpe

ansible/portal.yml

@@ -48,3 +48,15 @@
         name: openondemand
         tasks_from: rstudio_compute.yml
       when: appliances_mode != 'configure' # is run during build
+
+- hosts: openondemand_matlab
+  tags:
+    - openondemand
+    - openondemand_matlab
+  become: yes
+  gather_facts: yes
+  tasks:
+    - import_role:
+        name: openondemand
+        tasks_from: vnc_compute.yml
+      when: appliances_mode != 'configure' # is run during build

ansible/roles/openondemand/defaults/main.yml

@@ -25,6 +25,7 @@ openondemand_filesapp_paths: []
 openondemand_jupyter_partition: ''
 openondemand_dashboard_links: []
 openondemand_rstudio_partition: ''
+openondemand_matlab_partition: ''
 
 # Monitoring:
 openondemand_exporter: true

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

@@ -2,6 +2,7 @@ openondemand_auth: basic_pam
 openondemand_jupyter_partition: standard
 openondemand_desktop_partition: standard
 openondemand_rstudio_partition: standard
+openondemand_matlab_partition: standard
 #openondemand_dashboard_support_url: 
 #openondemand_dashboard_docs_url:
 #openondemand_filesapp_paths:

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

@@ -15,6 +15,7 @@ openondemand_auth: basic_pam
 openondemand_jupyter_partition: "{{ openhpc_partitions[0]['name'] }}"
 openondemand_desktop_partition: "{{ openhpc_partitions[0]['name'] }}"
 openondemand_rstudio_partition: "{{ openhpc_partitions[0]['name'] }}"
+openondemand_matlab_partition: "{{ openhpc_partitions[0]['name'] }}"
 
 # Regex defining hosts which openondemand can proxy; the default regex is compute nodes (for apps) and grafana host,
 # e.g. if the group `compute` has hosts `compute-{0,1,2,..}` this will be '(compute-\d+)|(control)'.
@@ -90,12 +91,17 @@ openondemand_install_app_rstudio:  # mapping, values as for ansible.builtin.git:
   rstudio:
     repo: https://github.com/stackhpc/ood-stackhpc-rstudio.git
     version: main
+openondemand_install_app_matlab:
+  matlab:
+    repo: https://github.com/stackhpc/ood-stackhpc-matlab.git
+    version: main
 # osc:ood role var (NB only active when not in configure):
 ood_install_apps: >-
   {{
     {}
     | combine(openondemand_install_app_jupyter if openondemand_jupyter_partition else {})
     | combine(openondemand_install_app_rstudio if openondemand_rstudio_partition else {})
+    | combine(openondemand_install_app_matlab if openondemand_matlab_partition else {})
   }}
 
 # https://github.com/OSC/ondemand/tree/master/apps/bc_desktop
@@ -211,6 +217,39 @@ openondemand_apps_rstudio_default:
         - <%= "--nodelist=#{node}" %>
 openondemand_apps_rstudio: "{{ {'rstudio':openondemand_apps_rstudio_default} if openondemand_rstudio_partition | default(none) else {} }}"
 
+openondemand_apps_matlab_default:
+  title: MATLAB
+  description: Request a desktop to run MATLAB.
+  cluster: slurm
+  form:
+    - desktop
+    - bc_queue
+    - bc_num_hours
+    - num_cores
+    - node
+  attributes:
+    desktop: xfce
+    # bc_account: # i.e. slurm account
+    #   value: root
+    bc_queue:
+      value: "{{ openondemand_matlab_partition | default(none) }}"
+    num_cores:
+      label: Number of cores
+      value: 1
+    node:
+      label: Node name
+      help: Select a particular node or leave empty to let Slurm pick the next available
+      value: ""
+  submit: |
+    ---
+    script:
+      job_name: "ood-matlab"
+      native:
+        - <%= "--nodes=1" %>
+        - <%= "--ntasks=#{num_cores}" %>
+        - <%= "--nodelist=#{node}" %>
+openondemand_apps_matlab: "{{ {'matlab':openondemand_apps_matlab_default} if openondemand_matlab_partition | default(none) else {} }}"
+
 # osc.ood:ood_apps - see https://github.com/OSC/ood-ansible#ood_apps
 openondemand_dashboard_support_url: ''
 openondemand_dashboard_docs_url: ''
@@ -230,7 +269,7 @@ openondemand_apps:
       ood_brand_bg_color: "#0e6ec8"
       ood_dashboard_title: "{{ openhpc_cluster_name }}"
 
-ood_apps: "{{ openondemand_apps | combine(openondemand_apps_jupyter) | combine(openondemand_apps_desktop) | combine(openondemand_apps_rstudio) }}"
+ood_apps: "{{ openondemand_apps | combine(openondemand_apps_jupyter) | combine(openondemand_apps_desktop) | combine(openondemand_apps_rstudio) | combine(openondemand_apps_matlab) }}"
 
 # Prometheus config for Open Ondemand exporter
 # https://osc.github.io/ood-documentation/latest/monitoring/prometheus.html#prometheus-configuration

environments/common/inventory/groups

@@ -91,6 +91,9 @@ fail2ban
 [openondemand_rstudio]
 # Subset of compute to run RStudio servers on via Open Ondemand
 
+[openondemand_matlab]
+# Subset of compute to run RStudio servers on via Open Ondemand
+
 [etc_hosts]
 # Hosts to manage /etc/hosts e.g. if no internal DNS. See ansible/roles/etc_hosts/README.md
 

environments/common/layouts/everything

@@ -59,6 +59,10 @@ compute
 # Subset of compute to run RStudio servers on via Open Ondemand
 compute
 
+[openondemand_matlab:children]
+# Subset of compute to run a MATLAB interactive desktop on via Open Ondemand
+compute
+
 [etc_hosts:children]
 # Hosts to manage /etc/hosts e.g. if no internal DNS. See ansible/roles/etc_hosts/README.md
 cluster