projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
15370: Merge branch 'main' into 15370-loopback-dispatchcloud
[arvados.git]
/
lib
/
config
/
config.default.yml
diff --git
a/lib/config/config.default.yml
b/lib/config/config.default.yml
index 893542df184c1c0c2ec43f459833512465e97ecc..d965633055dcb1da4d72548168b1d700f83cd541 100644
(file)
--- a/
lib/config/config.default.yml
+++ b/
lib/config/config.default.yml
@@
-1281,7
+1281,9
@@
Clusters:
# need to be detected and cleaned up manually.
TagKeyPrefix: Arvados
# need to be detected and cleaned up manually.
TagKeyPrefix: Arvados
- # Cloud driver: "azure" (Microsoft Azure) or "ec2" (Amazon AWS).
+ # Cloud driver: "azure" (Microsoft Azure), "ec2" (Amazon AWS),
+ # or "loopback" (run containers on dispatch host for testing
+ # purposes).
Driver: ec2
# Cloud-specific driver parameters.
Driver: ec2
# Cloud-specific driver parameters.