X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/3c034a63249b94b07449407ad5c4f4115a1ef974..e308ed737cb1645014f75eeb6774ad87d7d502a7:/lib/config/config.default.yml

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 002acd03aa..7f191eb118 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -294,9 +294,7 @@ Clusters:
       NewInactiveUserNotificationRecipients: {}
 
       # Set AnonymousUserToken to enable anonymous user access. Populate this
-      # field with a long random string. Then run "bundle exec
-      # ./script/get_anonymous_user_token.rb" in the directory where your API
-      # server is running to record the token in the database.
+      # field with a random string at least 50 characters long.
       AnonymousUserToken: ""
 
       # If a new user has an alternate email address (local@domain)
@@ -899,10 +897,20 @@ Clusters:
       # go down.
       MaxComputeVMs: 64
 
-      # Preemptible instance support (e.g. AWS Spot Instances)
-      # When true, child containers will get created with the preemptible
-      # scheduling parameter parameter set.
-      UsePreemptibleInstances: false
+      # Schedule all child containers on preemptible instances (e.g. AWS
+      # Spot Instances) even if not requested by the submitter.
+      #
+      # If false, containers are scheduled on preemptible instances
+      # only when requested by the submitter.
+      #
+      # Note that arvados-cwl-runner does not currently offer a
+      # feature to request preemptible instances, so this value
+      # effectively acts as a cluster-wide decision about whether to
+      # use preemptible instances.
+      #
+      # This flag is ignored if no preemptible instance types are
+      # configured, and has no effect on top-level containers.
+      AlwaysUsePreemptibleInstances: true
 
       # PEM encoded SSH key (RSA, DSA, or ECDSA) used by the
       # cloud dispatcher for executing containers on worker VMs.
@@ -1261,6 +1269,9 @@ Clusters:
           Region: ""
           EBSVolumeType: gp2
           AdminUsername: debian
+          # (ec2) name of the IamInstanceProfile for instances started by
+          # the cloud dispatcher. Leave blank when not needed.
+          IamInstanceProfile: ""
 
           # (azure) Credentials.
           SubscriptionID: ""