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/ansible/cleanup.yml b/ansible/cleanup.yml index 6b495d72c..b9a0d72a3 100644 --- a/ansible/cleanup.yml +++ b/ansible/cleanup.yml @@ -47,8 +47,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 diff --git a/ansible/fatimage.yml b/ansible/fatimage.yml index 8e8e58a69..6eba87be0 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: @@ -136,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 # Used for plain desktop and matlab ansible.builtin.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 ansible.builtin.import_role: name: openondemand tasks_from: jupyter_compute.yml when: "'openondemand_jupyter' in group_names" + - 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 + 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 diff --git a/environments/common/inventory/group_vars/all/openondemand.yml b/environments/common/inventory/group_vars/all/openondemand.yml index 77270520c..ea88b089c 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 '' }}" @@ -198,8 +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 }}"] 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] @@ -288,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 }}"] 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. @@ -349,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 }}"] bc_queue: value: "{{ openondemand_codeserver_partition | default(none) }}" cores: 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" { diff --git a/requirements.yml b/requirements.yml index 98785d7c7..27dbcbeba 100644 --- a/requirements.yml +++ b/requirements.yml @@ -17,7 +17,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