Merge branch '16796-arvbox-webshell' refs #16796

[arvados.git] / lib / config / generated_config.go

diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 866012e09977792b85f4b308cf0a796416f1f1ac..201ae3604537f9f44a9e788320b7262685944f98 100644 (file)
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -951,11 +951,11 @@ Clusters:
         # unlimited).
         MaxCloudOpsPerSecond: 0
 
-        # Maximum concurrent node creation operations (0 = unlimited).  (azure)
-        # managed disks: set MaxConcurrentNodeCreateOps to 20 to avoid
-        # timeouts, cf
-        # https://docs.microsoft.com/en-us/azure/virtual-machines/linux/capture-image
-        MaxConcurrentNodeCreateOps: 0
+        # Maximum concurrent node creation operations (0 = unlimited). This is
+        # recommended by Azure in certain scenarios (see
+        # https://docs.microsoft.com/en-us/azure/virtual-machines/linux/capture-image)
+        # and can be used with other cloud providers too, if desired.
+        MaxConcurrentInstanceCreateOps: 0
 
         # Interval between cloud provider syncs/updates ("list all
         # instances").
@@ -1344,6 +1344,10 @@ Clusters:
       VocabularyURL: ""
       FileViewersConfigURL: ""
 
+      # Idle time after which the user's session will be auto closed.
+      # This feature is disabled when set to zero.
+      IdleTimeout: 0s
+
       # Workbench welcome screen, this is HTML text that will be
       # incorporated directly onto the page.
       WelcomePageHTML: |