From 32146430c69b439e2d231b2394661b20c2111bbe Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 19 Sep 2025 10:52:51 +0200 Subject: [PATCH 1/2] Fix syntax for RStudio version This would render as `rstudio-server/2025.05.1-513}`, causing a module load error. --- environments/common/inventory/group_vars/all/openondemand.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/common/inventory/group_vars/all/openondemand.yml b/environments/common/inventory/group_vars/all/openondemand.yml index 77270520c..da10fd8ec 100644 --- a/environments/common/inventory/group_vars/all/openondemand.yml +++ b/environments/common/inventory/group_vars/all/openondemand.yml @@ -199,7 +199,7 @@ openondemand_apps_rstudio_default: widget: select options: - "RStudio v{{ openondemand_rstudio_version }}" - - "rstudio-server/{{ openondemand_rstudio_version }}}" + - "rstudio-server/{{ openondemand_rstudio_version }}" 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 # noqa: yaml[line-length] From f267a33f5a713a048907bee31bc59e65fde3760e Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 19 Sep 2025 15:49:23 +0200 Subject: [PATCH 2/2] Add RStudio and Code Server to fat image build --- ansible/fatimage.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/ansible/fatimage.yml b/ansible/fatimage.yml index 8e8e58a69..15587ad84 100644 --- a/ansible/fatimage.yml +++ b/ansible/fatimage.yml @@ -121,7 +121,7 @@ when: "'openhpc' in group_names" # - import_playbook: portal.yml - - name: Open Ondemand server (packages) + - name: Open OnDemand server (packages) ansible.builtin.include_role: name: osc.ood tasks_from: install-package.yml @@ -129,25 +129,37 @@ when: "'openondemand' in group_names" # # FUTURE: install-apps.yml - this is git clones - - name: Open Ondemand server (apps) + - name: Open OnDemand server (apps) ansible.builtin.include_role: name: osc.ood tasks_from: install-apps.yml vars_from: "Rocky/{{ ansible_distribution_major_version }}.yml" when: "'openondemand' in group_names" - - name: Open Ondemand remote desktop + - name: Open OnDemand remote desktop ansible.builtin.import_role: name: openondemand tasks_from: vnc_compute.yml when: "'openondemand_desktop' in group_names" - - name: Open Ondemand jupyter node + - name: Open OnDemand Jupyter Notebook ansible.builtin.import_role: name: openondemand tasks_from: jupyter_compute.yml when: "'openondemand_jupyter' in group_names" + - name: Open OnDemand RStudio + ansible.builtin.import_role: + name: openondemand + tasks_from: rstudio_compute.yml + when: "'openondemand_rstudio' in group_names" + + - name: Open OnDemand Code Server + ansible.builtin.import_role: + name: openondemand + tasks_from: codeserver_compute.yml + when: "'openondemand_codeserver' in group_names" + - name: Install Apache PAM module # Extracted from start of roles/openondemand/tasks/pam_auth.yml to ensure only installed during build ansible.builtin.dnf: name: mod_authnz_pam