Configurable list of remote viz queues

.github/workflows/configs/almalinux.yml

@@ -59,13 +59,17 @@ queues:
 
 # Remote Viz Queues
   - name: viz3d
+    type: remoteviz
+    description: "With GPU - Small GPU node for single session"
     vm_size: Standard_NV12s_v3
     max_count: 4
     image: azhpc:azhop-desktop:almalinux-8_7:latest
     ColocateNodes: false
     EnableAcceleratedNetworking: true
 
   - name: viz
+    type: remoteviz
+    description: "Without GPU - for single session"
     vm_size: Standard_D8s_v5
     max_count: 10
     image: azhpc:azhop-desktop:almalinux-8_7:latest
@@ -75,6 +79,9 @@ queues:
     min_hours: 1 # Minimum session duration - 0 is infinite
 
   - name: largeviz3d
+    type: remoteviz
+    description: "Large With GPU - Intented for shared sessions"
+    shareable: true
     vm_size: Standard_NV48s_v3
     max_count: 4
     image: azhpc:azhop-desktop:almalinux-8_7:latest

.github/workflows/configs/centos.yml

@@ -65,6 +65,8 @@ queues:
 
 # Remote Viz Queues
   - name: viz3d
+    type: remoteviz
+    description: "With GPU - Small GPU node for single session"
     vm_size: Standard_NV12s_v3
     max_count: 4
     image: azhpc:azhop-desktop:centos-7_9:latest
@@ -73,6 +75,8 @@ queues:
 
   - name: viz
     vm_size: Standard_D8s_v5
+    type: remoteviz
+    description: "Without GPU - for single session"
     max_count: 10
     image: azhpc:azhop-desktop:centos-7_9:latest
     ColocateNodes: false
@@ -82,6 +86,9 @@ queues:
 
   - name: largeviz3d
     vm_size: Standard_NV48s_v3
+    type: remoteviz
+    description: "Large With GPU - Intented for shared sessions"
+    shareable: true
     max_count: 4
     image: azhpc:azhop-desktop:centos-7_9:latest
     ColocateNodes: false

.github/workflows/configs/integration.yml

@@ -262,6 +262,8 @@ queues:
 
 # Remote Viz Queues
   - name: viz3d
+    type: remoteviz
+    description: "With GPU - Small GPU node for single session"
     vm_size: Standard_NV12s_v3
     max_count: 4
     image: azhpc:azhop-desktop:centos-7_9:latest
@@ -270,6 +272,8 @@ queues:
     EnableAcceleratedNetworking: true
   - name: viz
     vm_size: Standard_D8s_v5
+    type: remoteviz
+    description: "Without GPU - for single session"
     max_count: 10
     image: azhpc:azhop-desktop:centos-7_9:latest
     ColocateNodes: false
@@ -278,6 +282,9 @@ queues:
     max_hours: 12 # Maximum session duration
     min_hours: 1 # Minimum session duration - 0 is infinite
   - name: largeviz3d
+    type: remoteviz
+    description: "Large With GPU - Intented for shared sessions"
+    shareable: true
     vm_size: Standard_NV48s_v3
     max_count: 2
     image: azhpc:azhop-desktop:centos-7_9:latest

config.schema.json

@@ -1116,6 +1116,23 @@
                 "min_hours": {
                     "description": "Minimum session duration",
                     "type": "integer"
+                },
+                "type": {
+                    "description": "Type of queue - mandatory for remoteviz nodes",
+                    "enum": [
+                        "remoteviz",
+                        "compute"
+                    ],
+                    "type": "string"
+                },
+                "description": {
+                    "description": "Description of the queue that will appear in the node selection choice of the ood portal",
+                    "type": "string"
+                },
+                "shareable": {
+                    "description": "Whether the remote visualization node can be shared by multiple users. Defaults to false",
+                    "type": "boolean",
+                    "default": false
                 }
             },
             "required": [

config.tpl.yml

@@ -499,8 +499,11 @@ queues:
     max_count: 0
     image: azhpc:azhop-compute:centos-7_9:latest
     EnableAcceleratedNetworking: true
-    # Queue dedicated to GPU remote viz nodes. This name is fixed and can't be changed
+
+# Queues for remote visualization
   - name: viz3d
+    type: remoteviz # mandatory property to specify the queue is for remote viz nodes
+    description: "With GPU - Small GPU node for single session" # optional description that will appear in the node selection choice of the ood portal
     vm_size: Standard_NV12s_v3
     max_count: 4
     # Use the pre-built azhop image from the marketplace
@@ -511,17 +514,22 @@ queues:
     EnableAcceleratedNetworking: true
     max_hours: 12 # Maximum session duration
     min_hours: 1 # Minimum session duration - 0 is infinite
-    # Queue dedicated to share GPU remote viz nodes. This name is fixed and can't be changed
+
   - name: largeviz3d
+    type: remoteviz
+    description: "Large With GPU - Intented for shared sessions"
+    shareable: true # Set to true to allow multiple users to connect to the same node - false by default
     vm_size: Standard_NV48s_v3
     max_count: 2
     image: azhpc:azhop-desktop:centos-7_9:latest
     ColocateNodes: false
     EnableAcceleratedNetworking: true
     max_hours: 12
     min_hours: 1
-    # Queue dedicated to non GPU remote viz nodes. This name is fixed and can't be changed
+
   - name: viz
+    type: remoteviz
+    description: "Without GPU - for single session"
     vm_size: Standard_D8s_v5
     max_count: 10
     image: azhpc:azhop-desktop:centos-7_9:latest

playbooks/nodearray_lookup.yml

@@ -41,6 +41,13 @@
       delegate_to: ondemand
       become: true
 
+    - name: Copy the viz node configuration file
+      template:
+        src: 'viz_nodes.yml.j2'
+        dest: '/etc/ood/config/apps/bc_desktop/config/viz_nodes.yml'
+      delegate_to: ondemand
+      become: true
+
     # - name: create config directory
     #   file:
     #     path: /etc/ood/config/apps/bc_desktop/config

playbooks/ood-overrides-common.yml

@@ -39,7 +39,7 @@ ood_apps:
     form:
       - desktop
       - target
-      - num_hours
+      - bc_num_hours
       - bucket
     attributes:
       desktop: xfce
@@ -48,23 +48,8 @@ ood_apps:
         label: "Session target"
         help: |
           Select the resource target for the remote desktop session <br>
-          - **With GPU** <br>
-            These are standard small GPU nodes for visualization for a single user session.<br>
-          - **Large With GPU** <br>
-            These are standard large GPU nodes for visualization, usually for multiple users sessions sharing the same node.<br>
-          - **Without GPU** <br>
-            Same as for **With GPU** but without a GPU accelerator.
         options:
-         - ["With GPU - Small GPU node for single session", "viz3d", data-hide-bucket: true, data-set-bucket: 1, 
-              data-max-num-hours: "{{ (queues | selectattr('name', 'equalto', 'viz3d') | map(attribute='max_hours', default=8)) }}", 
-              data-min-num-hours: "{{ (queues | selectattr('name', 'equalto', 'viz3d') | map(attribute='min_hours', default=1)) }}"]
-         - ["Large With GPU - Intented for shared sessions", "largeviz3d", 
-              data-max-num-hours: "{{ (queues | selectattr('name', 'equalto', 'largeviz3d') | map(attribute='max_hours', default=8)) }}", 
-              data-min-num-hours: "{{ (queues | selectattr('name', 'equalto', 'largeviz3d') | map(attribute='min_hours', default=1)) }}"]
-         - ["Without GPU - for single session", "viz", data-hide-bucket: true, data-set-bucket: 1, 
-              data-max-num-hours: "{{ (queues | selectattr('name', 'equalto', 'viz') | map(attribute='max_hours', default=8)) }}", 
-              data-min-num-hours: "{{ (queues | selectattr('name', 'equalto', 'viz') | map(attribute='min_hours', default=1)) }}"]
-      num_hours:
+      bc_num_hours:
         widget: "number_field"
         label: "Maximum duration in hours of your remote session"
         value: 1

playbooks/ood-overrides-openpbs.yml

@@ -14,12 +14,6 @@ ood_apps:
 
         scheduler_args = ["-q", "vizq"]
 
-        # If the user has specified a number of hours, set the job walltime
-        hours = num_hours.to_i
-        if hours > 0
-          scheduler_args += ["-l", "walltime=%02d:00:00" % hours]
-        end
-
         # If the user has specified a node ratio greather than 1, set the job ppn
         node_ratio = bucket.to_i
         node_arrays = YAML.load_file("/etc/ood/config/apps/bc_desktop/config/node_arrays.yml")

playbooks/ood-overrides-slurm.yml

@@ -12,12 +12,6 @@ ood_apps:
         require "yaml"
         scheduler_args = ["-p", target]
 
-        # If the user has specified a number of hours, set the job walltime
-        hours = num_hours.to_i
-        if hours > 0
-          scheduler_args += ["-t", "%02d:00:00" % hours]
-        end
-
         # If the user has specified a node ratio greather than 1, set the job ppn
         node_ratio = bucket.to_i
         node_arrays = YAML.load_file("/etc/ood/config/apps/bc_desktop/config/node_arrays.yml")

playbooks/ood.yml

@@ -538,13 +538,36 @@
         shell: cvmfs_config setup 
     when:  ( cvmfs_eessi.enabled | default(false) )
 
-  # Generate the node array core lookup file for ondemand - will be only run if the marker file for ondemand exists
   - name: "yq: Download and install (CentOS)"
     get_url:
       url: "https://github.com/mikefarah/yq/releases/download/{{ yq_version }}/{{ yq_binary }}"
       dest: /usr/bin/yq
       mode: 0755
 
+# Configure bc_desktop for dynamic remote viz targets
+  - name: copy bc_desktop file
+    copy:
+      remote_src: true
+      src: /etc/ood/config/apps/bc_desktop/ondemand.yml
+      dest: /etc/ood/config/apps/bc_desktop/ondemand.yml.erb
+
+  - name: configure bc_desktop to dynamically load viz targets
+    blockinfile:
+      path: /etc/ood/config/apps/bc_desktop/ondemand.yml.erb
+      insertafter : "options: null"
+      backup: no
+      block: |
+        # Dynamically load viz targets - keep indentation as is
+                <%- File.readlines("/etc/ood/config/apps/bc_desktop/config/viz_nodes.yml").each do |line|  %>
+                    <%= line.to_s %>
+                <%- end %>
+  - name: remove the null value of the options
+    replace:
+      path: /etc/ood/config/apps/bc_desktop/ondemand.yml.erb
+      regexp: 'options: null'
+      replace: 'options:' 
+
+  # Generate the node array core lookup file for ondemand - will be only run if the marker file for ccluster exists
   - import_tasks: nodearray_lookup.yml
     vars:
       marker_file: cccluster.ok

playbooks/roles/ood-applications/files/bc_ansys_workbench/form.yml.erb

@@ -25,22 +25,10 @@ attributes:
     label: "Session target"
     help: |
       Select the resource target for the remote desktop session <br>
-      - **With GPU** <br>
-        These are standard small GPU nodes for visualization for a single user session.<br>
-      - **Large With GPU** <br>
-        These are standard large GPU nodes for visualization, usually for multiple users sessions sharing the same node.<br>
-      - **Without GPU** <br>
-        Same as for **With GPU** but without a GPU accelerator.
     options:
-      - ["With GPU - Small GPU node for single session", "viz3d", data-hide-bucket: true, data-set-bucket: 1, 
-          data-max-bc-num-hours: "8", 
-          data-min-bc-num-hours: "1"]
-      - ["Large With GPU - Intented for shared sessions", "largeviz3d", 
-          data-max-bc-num-hours: "8", 
-          data-min-bc-num-hours: "1"]
-      - ["Without GPU - for single session", "viz", data-hide-bucket: true, data-set-bucket: 1, 
-          data-max-bc-num-hours: "8", 
-          data-min-bc-num-hours: "1"]
+    <%- File.readlines("/etc/ood/config/apps/bc_desktop/config/viz_nodes.yml").each do |line|  %>
+      <%= line.to_s %>
+    <%- end %>
   bucket:
       widget: "select"
       label: "Node bucket"

playbooks/roles/ood-applications/files/bc_paraview/form.yml.erb

@@ -12,8 +12,6 @@ attributes:
         widget: "number_field"
         label: "Maximum duration in hours of your session"
         value: 1
-        min: 1
-        max: 8
         help: |
             This is the maximum duration in hours of your session once started.
         step: 1
@@ -22,22 +20,10 @@ attributes:
         label: "Node type"
         help: |
             Select the resource target for the remote desktop session <br>
-            - **With GPU** <br>
-                These are standard small GPU nodes for visualization for a single user session.<br>
-            - **Large With GPU** <br>
-                These are standard large GPU nodes for visualization, usually for multiple users sessions sharing the same node.<br>
-            - **Without GPU** <br>
-                Same as for **With GPU** but without a GPU accelerator.
         options:
-            - ["With GPU - Small GPU node for single session", "viz3d", data-hide-bucket: true, data-set-bucket: 1,
-                data-max-bc-num-hours: "8",
-                data-min-bc-num-hours: "1"]
-            - ["Large With GPU - Intented for shared sessions", "largeviz3d",
-                data-max-bc-num-hours: "8",
-                data-min-bc-num-hours: "1"]
-            - ["Without GPU - for single session", "viz", data-hide-bucket: true, data-set-bucket: 1,
-                data-max-bc-num-hours: "8",
-                data-min-bc-num-hours: "1"]
+        <%- File.readlines("/etc/ood/config/apps/bc_desktop/config/viz_nodes.yml").each do |line|  %>
+            <%= line.to_s %>
+        <%- end %>
     bucket:
         widget: "select"
         label: "Node bucket"

playbooks/roles/ood-applications/files/bc_vizer/form.yml.erb

@@ -22,22 +22,10 @@ attributes:
         label: "Node type"
         help: |
             Select the resource target for the remote desktop session <br>
-            - **With GPU** <br>
-                These are standard small GPU nodes for visualization for a single user session.<br>
-            - **Large With GPU** <br>
-                These are standard large GPU nodes for visualization, usually for multiple users sessions sharing the same node.<br>
-            - **Without GPU** <br>
-                Same as for **With GPU** but without a GPU accelerator.
         options:
-            - ["With GPU - Small GPU node for single session", "viz3d", data-hide-bucket: true, data-set-bucket: 1,
-                data-max-bc-num-hours: "8",
-                data-min-bc-num-hours: "1"]
-            - ["Large With GPU - Intented for shared sessions", "largeviz3d",
-                data-max-bc-num-hours: "8",
-                data-min-bc-num-hours: "1"]
-            - ["Without GPU - for single session", "viz", data-hide-bucket: true, data-set-bucket: 1,
-                data-max-bc-num-hours: "8",
-                data-min-bc-num-hours: "1"]
+        <%- File.readlines("/etc/ood/config/apps/bc_desktop/config/viz_nodes.yml").each do |line|  %>
+            <%= line.to_s %>
+        <%- end %>
     bucket:
         widget: "select"
         label: "Node bucket"

playbooks/roles/ood-applications/files/bc_vmd/form.yml.erb

@@ -24,22 +24,10 @@ attributes:
     label: "Session target"
     help: |
       Select the resource target for the remote desktop session <br>
-      - **With GPU** <br>
-        These are standard small GPU nodes for visualization for a single user session.<br>
-      - **Large With GPU** <br>
-        These are standard large GPU nodes for visualization, usually for multiple users sessions sharing the same node.<br>
-      - **Without GPU** <br>
-        Same as for **With GPU** but without a GPU accelerator.
     options:
-      - ["With GPU - Small GPU node for single session", "viz3d", data-hide-bucket: true, data-set-bucket: 1, 
-          data-max-bc-num-hours: "8", 
-          data-min-bc-num-hours: "1"]
-      - ["Large With GPU - Intented for shared sessions", "largeviz3d", 
-          data-max-bc-num-hours: "8", 
-          data-min-bc-num-hours: "1"]
-      - ["Without GPU - for single session", "viz", data-hide-bucket: true, data-set-bucket: 1, 
-          data-max-bc-num-hours: "8", 
-          data-min-bc-num-hours: "1"]
+        <%- File.readlines("/etc/ood/config/apps/bc_desktop/config/viz_nodes.yml").each do |line|  %>
+            <%= line.to_s %>
+        <%- end %>
   bucket:
       widget: "select"
       label: "Node bucket"

playbooks/templates/viz_nodes.yml.j2

@@ -0,0 +1,3 @@
+{% for queue in ( queues | rejectattr('type', 'undefined') | selectattr('type', 'match', 'remoteviz'))%}
+- ["{{ queue.description | default(queue.name) }}", "{{ queue.name }}", data-max-bc-num-hours: {{ queue.max_hours | default(8) }}, data-min-bc-num-hours: {{ queue.min_hours | default(1) }}{% if (queue.shareable is not defined) or (queue.shareable is defined and not queue.shareable) %}, data-hide-bucket: true, data-set-bucket: 1 {% endif %}]
+{% endfor %}