Skip to content

Commit e137a6b

Browse files
committed
Merge branch 'feat/oodv3' of github.com:stackhpc/ansible-slurm-appliance into feat/oodv3
2 parents 06baa59 + e3d3e30 commit e137a6b

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

ansible/fatimage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
tasks_from: install.yml
4646

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

5151
# - import_playbook: portal.yml

ansible/roles/openondemand/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
- include_role:
1111
name: osc.ood
1212
tasks_from: install-package.yml
13-
vars_from: Rocky.yml
13+
vars_from: Rocky/8.yml
1414
public: yes # Expose the vars from this role to the rest of the play
1515
# can't set vars: from a dict hence the workaround above
1616

environments/common/inventory/group_vars/all/openondemand.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# or include regex special characters.
1414
openondemand_host_regex: "{{ (groups['compute'] + groups['grafana']) | to_ood_regex }}"
1515

16-
ondemand_package: ondemand-2.0.29
16+
ondemand_package: ondemand-3.0.1
1717

1818
openondemand_dashboard_links: # TODO: should really only be deployed if grafana is deployed and proxying configured
1919
- name: Grafana

requirements.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ roles:
1919
# No versions available
2020
- src: https://github.com/OSC/ood-ansible.git
2121
name: osc.ood
22-
version: v2.0.8
22+
version: v3.0.6
2323

2424
collections:
2525
- name: containers.podman

0 commit comments

Comments
 (0)