Configurable list of remote viz queues (#1802)

* remove duplicated file * allow dynamic list of remote viz queues * move bc_desktop configuration at the end * fix yml typo * fix ruby code injection for dynamic list
Azure · Jan 4, 2024 · b1f9337 · b1f9337
1 parent 47eae2a
commit b1f9337
Show file tree

Hide file tree

Showing 17 changed files with 97 additions and 693 deletions.
diff --git a/.github/workflows/configs/almalinux.yml b/.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

diff --git a/.github/workflows/configs/centos.yml b/.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

diff --git a/.github/workflows/configs/integration.yml b/.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

diff --git a/config.schema.json b/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": [

diff --git a/config.tpl.yml b/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