16678: Don't trust API clients from trusted URLs when TokenLifetime is set.

[arvados.git] / services / nodemanager / doc / ec2.example.cfg

diff --git a/services/nodemanager/doc/ec2.example.cfg b/services/nodemanager/doc/ec2.example.cfg
index 2b6152a9a03b884c5078695e8cc3ea4532e91d2a..3bc905b0857f0bf52ba71944aeab5e2eea2242a6 100644 (file)
--- a/services/nodemanager/doc/ec2.example.cfg
+++ b/services/nodemanager/doc/ec2.example.cfg
@@ -176,15 +176,30 @@ security_groups = idstring1, idstring2
 # size class (since libcloud does not provide any consistent API for exposing
 # this setting).
 # You may also want to define the amount of scratch space (expressed
-# in GB) for Crunch jobs.  You can also override Amazon's provided
+# in MB) for Crunch jobs.  You can also override Amazon's provided
 # data fields (such as price per hour) by setting them here.
+#
+# Additionally, you can ask for a preemptible instance (AWS's spot instance)
+# by adding the appropriate boolean configuration flag. If you want to have
+# both spot & reserved versions of the same size, you can do so by renaming
+# the Size section and specifying the instance type inside it.
 
+# 100 GB scratch space
 [Size m4.large]
 cores = 2
 price = 0.126
-scratch = 100
+scratch = 100000
+
+# 10 GB scratch space
+[Size m4.large.spot]
+instance_type = m4.large
+preemptible = true
+cores = 2
+price = 0.126
+scratch = 10000
 
+# 200 GB scratch space
 [Size m4.xlarge]
 cores = 4
 price = 0.252
-scratch = 100
+scratch = 200000