use openondemand 2.0.29

Author: sjpb

ansible/roles/openondemand/tasks/main.yml

@@ -9,7 +9,7 @@
 # if using PAM auth we need apache installed but NOT started so split the osc.ood role up:
 - include_role:
     name: osc.ood
-    tasks_from: install-rpm.yml
+    tasks_from: install-package.yml
     vars_from: Rocky.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

environments/arcus/terraform/main.tf

@@ -14,6 +14,12 @@ variable "create_nodes" {
     default = true
 }
 
+variable "cluster_image" {
+    description = "single image for all cluster nodes - a convenience for CI"
+    type = string
+    default = "openhpc-221117-1324.qcow2" # https://github.com/stackhpc/slurm_image_builder/pull/9
+}
+
 module "cluster" {
     source = "../../skeleton/{{cookiecutter.environment}}/terraform/"
 
@@ -24,22 +30,22 @@ module "cluster" {
     key_pair = "slurm-app-ci"
     control_node = {
         flavor: "vm.alaska.cpu.general.small"
-        image: "openhpc-221116-1159.qcow2"
+        image: var.cluster_image
     }
     login_nodes = {
         login-0: {
             flavor: "vm.alaska.cpu.general.small"
-            image: "openhpc-221027-1557.qcow2"
+            image: var.cluster_image
         }
     }
     compute_types = {
         small: {
             flavor: "vm.alaska.cpu.general.small"
-            image: "openhpc-221116-1159.qcow2"
+            image: var.cluster_image
         }
         extra: {
             flavor: "vm.alaska.cpu.general.small"
-            image: "openhpc-221116-1159.qcow2"
+            image: var.cluster_image
         }
     }
     compute_nodes = {

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

@@ -7,7 +7,7 @@
 
 # openondemand_servername: '' # Must be defined when using openondemand
 
-ondemand_package: ondemand-2.0.28
+ondemand_package: ondemand-2.0.29
 
 openondemand_dashboard_links: # TODO: should really only be deployed if grafana is deployed and proxying configured
   - name: Grafana

requirements.yml

@@ -22,7 +22,7 @@ roles:
     # No versions available
   - src: https://github.com/OSC/ood-ansible.git
     name: osc.ood
-    version: v2.0.5
+    version: v2.0.8
 
 collections:
 - name: containers.podman