From 64370b9997e109867227c541fda564b6f9694c4a Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Thu, 11 Sep 2025 10:52:56 +0000 Subject: [PATCH 01/14] bump OSC's OOD v4.0.1 --- requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.yml b/requirements.yml index 8850c1615..d3dc6f701 100644 --- a/requirements.yml +++ b/requirements.yml @@ -19,7 +19,7 @@ roles: version: stackhpc-0.19.0 # fix grafana install - src: https://github.com/OSC/ood-ansible.git name: osc.ood - version: v3.1.5 + version: v4.0.1 - src: https://github.com/stackhpc/ansible-role-os-manila-mount.git name: stackhpc.os-manila-mount version: v25.3.1 From f5c6a2637429e65cb37a69eea72292ed40b1f76c Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Thu, 11 Sep 2025 12:42:14 +0000 Subject: [PATCH 02/14] pin ondemand 4.0.7 in common env --- 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 bd8ba7693..7542ea7b1 100644 --- a/environments/common/inventory/group_vars/all/openondemand.yml +++ b/environments/common/inventory/group_vars/all/openondemand.yml @@ -5,7 +5,7 @@ # NB: Variables prefixed ood_ are all from https://github.com/OSC/ood-ansible -ondemand_package_version: '3.1.10' # used in ansible/cleanup.yml +ondemand_package_version: '4.0.7' # used in ansible/cleanup.yml ondemand_package: ondemand-"{{ ondemand_package_version }}" # osc.ood role var controlling installed package openondemand_servername: "{{ hostvars[groups['openondemand'].0].ansible_host if groups['openondemand'] else '' }}" From cd883312e9acaa24db441326549a51b8aa43b3bf Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Fri, 12 Sep 2025 11:15:17 +0000 Subject: [PATCH 03/14] install ood app packages in fatimage.yml --- ansible/fatimage.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/ansible/fatimage.yml b/ansible/fatimage.yml index 46a99bc03..81bc5f91f 100644 --- a/ansible/fatimage.yml +++ b/ansible/fatimage.yml @@ -135,18 +135,30 @@ vars_from: "Rocky/{{ ansible_distribution_major_version }}.yml" when: "'openondemand' in group_names" - - name: Open Ondemand remote desktop + - name: Open Ondemand remote desktop (/MATLAB) import_role: name: openondemand tasks_from: vnc_compute.yml - when: "'openondemand_desktop' in group_names" + when: "'openondemand_desktop' or 'openondemand_matlab' in group_names" - - name: Open Ondemand jupyter node + - name: Open Ondemand Jupyter node import_role: name: openondemand tasks_from: jupyter_compute.yml when: "'openondemand_jupyter' in group_names" + - name: Open Ondemand RStudio node + import_role: + name: openondemand + tasks_from: rstudio_compute.yml + when: "'openondemand_rstudio' in group_names" + + - name: Open Ondemand Code Server node + 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 yum: name: mod_authnz_pam From 942c86eee82b892eca553618225e1845ab30cb83 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Fri, 12 Sep 2025 15:37:55 +0000 Subject: [PATCH 04/14] make packer volume 20 GB to manage ood app packages --- packer/openstack.pkr.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packer/openstack.pkr.hcl b/packer/openstack.pkr.hcl index 3f93d50a8..9faf4bb66 100644 --- a/packer/openstack.pkr.hcl +++ b/packer/openstack.pkr.hcl @@ -125,7 +125,7 @@ variable "volume_type" { variable "volume_size" { type = number - default = 15 + default = 20 } variable "image_disk_format" { From 94abd17be81982ba41ae6b5ce26e31107f6081d1 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Fri, 12 Sep 2025 17:53:21 +0000 Subject: [PATCH 05/14] fix typo --- 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 7542ea7b1..4fc9480c2 100644 --- a/environments/common/inventory/group_vars/all/openondemand.yml +++ b/environments/common/inventory/group_vars/all/openondemand.yml @@ -197,7 +197,7 @@ openondemand_apps_rstudio_default: help: Choose your RStudio module widget: select options: - - ["RStudio v{{ openondemand_rstudio_version }}", "rstudio-server/{{ openondemand_rstudio_version }}}"] + - ["RStudio v{{ 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 From 767e5e9c22749c578f8b91fcf4ed91517a04a1e3 Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Fri, 12 Sep 2025 18:30:35 +0000 Subject: [PATCH 06/14] bump images --- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index 6b294d157..c5133e77e 100644 --- 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-250820-0800-767addd8", - "RL9": "openhpc-RL9-250908-2047-d90ebd0e" + "RL8": "openhpc-RL8-250912-1755-94abd17b", + "RL9": "openhpc-RL9-250912-1755-94abd17b" } } From f7fd50566697da00479f901c4b644cfae985dedf Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 15 Sep 2025 10:09:33 +0000 Subject: [PATCH 07/14] update ood cleanup paths triggering trivy errors --- ansible/cleanup.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/cleanup.yml b/ansible/cleanup.yml index 3db6eb1e6..60d533c26 100644 --- a/ansible/cleanup.yml +++ b/ansible/cleanup.yml @@ -46,8 +46,8 @@ loop: # NB: items here MUST have a justification! # ondemand install: raised at https://github.com/OSC/ondemand/security/advisories/GHSA-f7j8-ppqm-m5vw # All declared not to be an issue by Open Ondemand as relevant packages not installed - - "/opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/{{ ondemand_package_version }}-1/gems/bootstrap_form-2.7.0/test/dummy/Gemfile.lock" - - "/opt/ood/ondemand/root/usr/share/gems/3.1/ondemand/{{ ondemand_package_version }}-1/gems/bootstrap_form-4.5.0/demo/yarn.lock" + - "/opt/ood/ondemand/root/usr/share/gems/3.3/ondemand/{{ ondemand_package_version }}-1/gems/bootstrap_form-2.7.0/test/dummy/Gemfile.lock" + - "/opt/ood/ondemand/root/usr/share/gems/3.3/ondemand/{{ ondemand_package_version }}-1/gems/bootstrap_form-5.0.0/demo/yarn.lock" - /var/www/ood/apps/sys/dashboard/node_modules/data-confirm-modal/Gemfile.lock # chrony role: only used for role dev, venv never created on disk - /etc/ansible-init/playbooks/roles/mrlesmithjr.chrony/poetry.lock From b7229ff947d46b0fa60e9a45eb128b009aa8d65b Mon Sep 17 00:00:00 2001 From: bertiethorpe Date: Mon, 15 Sep 2025 12:01:24 +0000 Subject: [PATCH 08/14] bump fatimages --- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index c5133e77e..16ac61e68 100644 --- 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-250912-1755-94abd17b", - "RL9": "openhpc-RL9-250912-1755-94abd17b" + "RL8": "openhpc-RL8-250915-1026-f7fd5056", + "RL9": "openhpc-RL9-250915-1026-f7fd5056" } } From 380711949b5e5467bc7d43340bc410ba1e404fc9 Mon Sep 17 00:00:00 2001 From: bertiethorpe <84867280+bertiethorpe@users.noreply.github.com> Date: Thu, 18 Sep 2025 16:33:49 +0100 Subject: [PATCH 09/14] noqa yaml[brackets] for OOD options --- .../common/inventory/group_vars/all/openondemand.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/environments/common/inventory/group_vars/all/openondemand.yml b/environments/common/inventory/group_vars/all/openondemand.yml index c4ca54374..c8f4802ac 100644 --- a/environments/common/inventory/group_vars/all/openondemand.yml +++ b/environments/common/inventory/group_vars/all/openondemand.yml @@ -198,7 +198,7 @@ openondemand_apps_rstudio_default: help: Choose your RStudio module widget: select options: - - ["RStudio v{{ openondemand_rstudio_version }}", "rstudio-server/{{ openondemand_rstudio_version }}"] + - ["RStudio v{{ openondemand_rstudio_version }}", "rstudio-server/{{ openondemand_rstudio_version }}"] # noqa: yaml[brackets] 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] @@ -287,8 +287,7 @@ openondemand_apps_matlab_default: help: Choose your MATLAB module widget: select options: - - "MATLAB v{{ openondemand_matlab_version }}" - - "matlab/{{ openondemand_matlab_version }}" + - ["MATLAB v{{ openondemand_matlab_version }}", "matlab/{{ openondemand_matlab_version }}"] # noqa: yaml[brackets] 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. @@ -348,8 +347,7 @@ openondemand_apps_codeserver_default: help: Choose your Code Server module widget: select options: - - "Code Server v{{ openondemand_code_server_version}}" - - "code-server/{{ openondemand_code_server_version }}" + - ["Code Server v{{ openondemand_code_server_version}}", "code-server/{{ openondemand_code_server_version }}"] # noqa: yaml[brackets] bc_queue: value: "{{ openondemand_codeserver_partition | default(none) }}" cores: From 39fd59a5bde051d9c1645481db571d32bfc5d9b5 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Fri, 19 Sep 2025 13:11:13 +0000 Subject: [PATCH 10/14] fix linter warnings about flow-style --- .yamllint.yml | 2 +- .../common/inventory/group_vars/all/openondemand.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.yamllint.yml b/.yamllint.yml index 32202604f..650a27ab8 100644 --- a/.yamllint.yml +++ b/.yamllint.yml @@ -3,7 +3,7 @@ extends: default rules: brackets: - forbid: non-empty + forbid: false comments: # https://github.com/prettier/prettier/issues/6780 min-spaces-from-content: 1 diff --git a/environments/common/inventory/group_vars/all/openondemand.yml b/environments/common/inventory/group_vars/all/openondemand.yml index 12f1a3719..ea88b089c 100644 --- a/environments/common/inventory/group_vars/all/openondemand.yml +++ b/environments/common/inventory/group_vars/all/openondemand.yml @@ -198,7 +198,7 @@ openondemand_apps_rstudio_default: help: Choose your RStudio module widget: select options: - - ["RStudio v{{ openondemand_rstudio_version }}", "rstudio-server/{{ openondemand_rstudio_version }}"] # noqa: yaml[brackets] + - ["RStudio v{{ 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] @@ -287,7 +287,7 @@ openondemand_apps_matlab_default: help: Choose your MATLAB module widget: select options: - - ["MATLAB v{{ openondemand_matlab_version }}", "matlab/{{ openondemand_matlab_version }}"] # noqa: yaml[brackets] + - ["MATLAB v{{ openondemand_matlab_version }}", "matlab/{{ openondemand_matlab_version }}"] 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. @@ -347,7 +347,7 @@ openondemand_apps_codeserver_default: help: Choose your Code Server module widget: select options: - - ["Code Server v{{ openondemand_code_server_version}}", "code-server/{{ openondemand_code_server_version }}"] # noqa: yaml[brackets] + - ["Code Server v{{ openondemand_code_server_version}}", "code-server/{{ openondemand_code_server_version }}"] bc_queue: value: "{{ openondemand_codeserver_partition | default(none) }}" cores: From cf9c688392871f578cc270d2a11dbd059189edee Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Fri, 19 Sep 2025 13:12:33 +0000 Subject: [PATCH 11/14] remove wrong comment --- ansible/fatimage.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/fatimage.yml b/ansible/fatimage.yml index 0c3f63612..977240885 100644 --- a/ansible/fatimage.yml +++ b/ansible/fatimage.yml @@ -127,7 +127,6 @@ 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) ansible.builtin.include_role: From 50b791cba03ff48e478f4eb1ec11b400683b1ce0 Mon Sep 17 00:00:00 2001 From: Steve Brasier <33413598+sjpb@users.noreply.github.com> Date: Fri, 19 Sep 2025 14:13:14 +0100 Subject: [PATCH 12/14] Add module FQDN --- ansible/fatimage.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/fatimage.yml b/ansible/fatimage.yml index 0c3f63612..70c9c1a0c 100644 --- a/ansible/fatimage.yml +++ b/ansible/fatimage.yml @@ -136,7 +136,7 @@ vars_from: "Rocky/{{ ansible_distribution_major_version }}.yml" when: "'openondemand' in group_names" - - name: Open Ondemand remote desktop (/MATLAB) + - name: Open Ondemand remote desktop # Used for plain desktop and matlab ansible.builtin.import_role: name: openondemand tasks_from: vnc_compute.yml @@ -149,13 +149,13 @@ when: "'openondemand_jupyter' in group_names" - name: Open Ondemand RStudio node - import_role: + ansible.builtin.import_role: name: openondemand tasks_from: rstudio_compute.yml when: "'openondemand_rstudio' in group_names" - name: Open Ondemand Code Server node - import_role: + ansible.builtin.import_role: name: openondemand tasks_from: codeserver_compute.yml when: "'openondemand_codeserver' in group_names" From e9afbfe5d4aa6556eb807d062aa8e17d07dc2004 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 24 Sep 2025 14:59:12 +0000 Subject: [PATCH 13/14] pickup task name fixes from PR#794 --- ansible/fatimage.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible/fatimage.yml b/ansible/fatimage.yml index 6eba87be0..7565af6f6 100644 --- a/ansible/fatimage.yml +++ b/ansible/fatimage.yml @@ -121,39 +121,39 @@ 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" - - 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 # Used for plain desktop and matlab + - name: Open OnDemand remote desktop # Used for plain desktop and matlab ansible.builtin.import_role: name: openondemand tasks_from: vnc_compute.yml when: "'openondemand_desktop' or 'openondemand_matlab' in group_names" - - name: Open Ondemand Jupyter node + - name: Open OnDemand Jupyter node ansible.builtin.import_role: name: openondemand tasks_from: jupyter_compute.yml when: "'openondemand_jupyter' in group_names" - - name: Open Ondemand RStudio node + - name: Open OnDemand RStudio node ansible.builtin.import_role: name: openondemand tasks_from: rstudio_compute.yml when: "'openondemand_rstudio' in group_names" - - name: Open Ondemand Code Server node + - name: Open OnDemand Code Server node ansible.builtin.import_role: name: openondemand tasks_from: codeserver_compute.yml From e1f97c6a27600e016da9bd4dfa00ede13c235982 Mon Sep 17 00:00:00 2001 From: Steve Brasier Date: Wed, 24 Sep 2025 19:57:16 +0000 Subject: [PATCH 14/14] bump CI image --- environments/.stackhpc/tofu/cluster_image.auto.tfvars.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json b/environments/.stackhpc/tofu/cluster_image.auto.tfvars.json index b0d102224..bcb56cf84 100644 --- 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-250923-1321-5fcc36b0", - "RL9": "openhpc-RL9-250923-1321-5fcc36b0" + "RL8": "openhpc-RL8-250924-1502-e9afbfe5", + "RL9": "openhpc-RL9-250924-1536-e9afbfe5" } }