Skip to content

Commit

Permalink
Merge pull request #314 from stackhpc/feat/oodv3
Browse files Browse the repository at this point in the history
Update to Open OnDemand v3.0.1
  • Loading branch information
sjpb authored Sep 27, 2023
2 parents 7eb855e + e137a6b commit 3c70674
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ansible/fatimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
tasks_from: install.yml

- name: Include distribution variables for osc.ood
include_vars: "{{ appliances_repository_root }}/ansible/roles/osc.ood/vars/Rocky.yml"
include_vars: "{{ appliances_repository_root }}/ansible/roles/osc.ood/vars/Rocky/8.yml"
# FUTURE: install-apps.yml - this is git clones

# - import_playbook: portal.yml
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/openondemand/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- include_role:
name: osc.ood
tasks_from: install-package.yml
vars_from: Rocky.yml
vars_from: Rocky/8.yml
public: yes # Expose the vars from this role to the rest of the play
# can't set vars: from a dict hence the workaround above

Expand Down
2 changes: 1 addition & 1 deletion environments/.stackhpc/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ variable "cluster_name" {
variable "cluster_image" {
description = "single image for all cluster nodes - a convenience for CI"
type = string
default = "openhpc-230922-0940-434e190f" # https://github.com/stackhpc/ansible-slurm-appliance/pull/313
default = "openhpc-230926-1343-e3d3e307" # https://github.com/stackhpc/ansible-slurm-appliance/pull/314
# default = "Rocky-8-GenericCloud-Base-8.7-20221130.0.x86_64.qcow2"
# default = "Rocky-8-GenericCloud-8.6.20220702.0.x86_64.qcow2"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# or include regex special characters.
openondemand_host_regex: "{{ (groups['compute'] + groups['grafana']) | to_ood_regex }}"

ondemand_package: ondemand-2.0.29
ondemand_package: ondemand-3.0.1

openondemand_dashboard_links: # TODO: should really only be deployed if grafana is deployed and proxying configured
- name: Grafana
Expand Down
2 changes: 1 addition & 1 deletion requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ roles:
# No versions available
- src: https://github.com/OSC/ood-ansible.git
name: osc.ood
version: v2.0.8
version: v3.0.6

collections:
- name: containers.podman
Expand Down

0 comments on commit 3c70674

Please sign in to comment.