Update ondemand to v3

ansible/fatimage.yml

@@ -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

ansible/roles/openondemand/tasks/main.yml

@@ -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
 

environments/.stackhpc/hooks/pre.yml

@@ -2,6 +2,12 @@
   become: yes
   gather_facts: false
   tasks:
+    - name: Ensure CI_CLOUD is set
+      assert:
+        that: "lookup('env', 'CI_CLOUD') != ''"
+        fail_msg: "Did you forget to `export CI_CLOUD={SMS,ARCUS}` when running manually?"
+      delegate_to: localhost
+
     - name: Write CI-generated inventory and secrets for debugging
       ansible.builtin.copy:
         dest: /etc/ci-config/

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

@@ -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

requirements.yml

@@ -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.3
 
 collections:
 - name: containers.podman