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..f6e99101618fa465530a68addef982c1eed01ab4 100644
(file)
--- a/
lib/config/config.default.yml
+++ b/
lib/config/config.default.yml
@@
-248,8
+248,9
@@
Clusters:
FreezeProjectRequiresDescription: false
# Project properties that must have non-empty values in order to
FreezeProjectRequiresDescription: false
# Project properties that must have non-empty values in order to
- # freeze a project. Example: {"property_name": true}
- FreezeProjectRequiresProperties: {}
+ # freeze a project. Example: "property_name": {}
+ FreezeProjectRequiresProperties:
+ SAMPLE: {}
# If true, only an admin user can un-freeze a project. If false,
# any user with "manage" permission can un-freeze.
# If true, only an admin user can un-freeze a project. If false,
# any user with "manage" permission can un-freeze.
@@
-1281,7
+1282,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.