Merge pull request #414 from stackhpc/feat/ood-jupyter-fatimage

Move jupyter openondemand installation to fatimage

Author: bertiethorpe

ansible/fatimage.yml

@@ -62,16 +62,25 @@
         tasks_from: install.yml
 
     # - import_playbook: portal.yml
-    - name: Open Ondemand server
+    - name: Open Ondemand server (packages)
       include_role:
         name: osc.ood
         tasks_from: install-package.yml
         vars_from: "Rocky/{{ ansible_distribution_major_version }}.yml"
     # # FUTURE: install-apps.yml - this is git clones
+    - name: Open Ondemand server (apps)
+      include_role:
+        name: osc.ood
+        tasks_from: install-apps.yml
+        vars_from: "Rocky/{{ ansible_distribution_major_version }}.yml"
     - name: Open Ondemand remote desktop
       import_role:
         name: openondemand
         tasks_from: vnc_compute.yml
+    - name: Open Ondemand jupyter node
+      import_role:
+        name: openondemand
+        tasks_from: jupyter_compute.yml
 
     # - import_playbook: monitoring.yml:
     - import_role:

environments/.stackhpc/terraform/main.tf

@@ -29,9 +29,9 @@ variable "cluster_image" {
     description = "single image for all cluster nodes, keyed by os_version - a convenience for CI"
     type = map(string)
     default = {
-        # https://github.com/stackhpc/ansible-slurm-appliance/pull/410
-        RL8: "openhpc-RL8-240712-1426-6830f97b"
-        RL9: "openhpc-ofed-RL9-240712-1425-6830f97b"
+        # https://github.com/stackhpc/ansible-slurm-appliance/pull/414
+        RL8: "openhpc-RL8-240723-0907-b560bf4c"
+        RL9: "openhpc-ofed-RL9-240723-0907-b560bf4c"
     }
 }