Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions ansible/fatimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,33 +121,45 @@
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
vars_from: "Rocky/{{ ansible_distribution_major_version }}.yml"
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
Loading