File tree Expand file tree Collapse file tree 4 files changed +13
-7
lines changed
ansible/roles/openondemand/tasks
common/inventory/group_vars/all Expand file tree Collapse file tree 4 files changed +13
-7
lines changed Original file line number Diff line number Diff line change 99# if using PAM auth we need apache installed but NOT started so split the osc.ood role up:
1010- include_role :
1111 name : osc.ood
12- tasks_from : install-rpm .yml
12+ tasks_from : install-package .yml
1313 vars_from : Rocky.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
Original file line number Diff line number Diff line change @@ -14,6 +14,12 @@ variable "create_nodes" {
1414 default = true
1515}
1616
17+ variable "cluster_image" {
18+ description = " single image for all cluster nodes - a convenience for CI"
19+ type = string
20+ default = " openhpc-221117-1324.qcow2" # https://github.com/stackhpc/slurm_image_builder/pull/9
21+ }
22+
1723module "cluster" {
1824 source = " ../../skeleton/{{cookiecutter.environment}}/terraform/"
1925
@@ -24,22 +30,22 @@ module "cluster" {
2430 key_pair = " slurm-app-ci"
2531 control_node = {
2632 flavor: " vm.alaska.cpu.general.small"
27- image: " openhpc-221116-1159.qcow2 "
33+ image: var.cluster_image
2834 }
2935 login_nodes = {
3036 login- 0 : {
3137 flavor: " vm.alaska.cpu.general.small"
32- image: " openhpc-221027-1557.qcow2 "
38+ image: var.cluster_image
3339 }
3440 }
3541 compute_types = {
3642 small: {
3743 flavor: " vm.alaska.cpu.general.small"
38- image: " openhpc-221116-1159.qcow2 "
44+ image: var.cluster_image
3945 }
4046 extra: {
4147 flavor: " vm.alaska.cpu.general.small"
42- image: " openhpc-221116-1159.qcow2 "
48+ image: var.cluster_image
4349 }
4450 }
4551 compute_nodes = {
Original file line number Diff line number Diff line change 77
88# openondemand_servername: '' # Must be defined when using openondemand
99
10- ondemand_package : ondemand-2.0.28
10+ ondemand_package : ondemand-2.0.29
1111
1212openondemand_dashboard_links : # TODO: should really only be deployed if grafana is deployed and proxying configured
1313 - name : Grafana
Original file line number Diff line number Diff line change 2222 # No versions available
2323 - src : https://github.com/OSC/ood-ansible.git
2424 name : osc.ood
25- version : v2.0.5
25+ version : v2.0.8
2626
2727collections :
2828- name : containers.podman
You can’t perform that action at this time.
0 commit comments