projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16625: implement review feedback.
[arvados.git]
/
lib
/
config
/
config.default.yml
diff --git
a/lib/config/config.default.yml
b/lib/config/config.default.yml
index 907acdc87847f9c052aee71c5e1d1fbe8c4f78aa..02bb3525e17c78cd4f434a41895f660c5ee32250 100644
(file)
--- a/
lib/config/config.default.yml
+++ b/
lib/config/config.default.yml
@@
-952,6
+952,10
@@
Clusters:
TimeoutShutdown: 10s
# Worker VM image ID.
TimeoutShutdown: 10s
# Worker VM image ID.
+ # (aws) AMI identifier
+ # (azure) managed disks: the name of the managed disk image
+ # (azure) unmanaged disks (deprecated): the complete URI of the VHD, e.g.
+ # https://xxxxx.blob.core.windows.net/system/Microsoft.Compute/Images/images/xxxxx.vhd
ImageID: ""
# An executable file (located on the dispatcher host) to be
ImageID: ""
# An executable file (located on the dispatcher host) to be
@@
-1008,13
+1012,33
@@
Clusters:
# (azure) Instance configuration.
CloudEnvironment: AzurePublicCloud
# (azure) Instance configuration.
CloudEnvironment: AzurePublicCloud
- ResourceGroup: ""
Location: centralus
Location: centralus
+
+ # (azure) The resource group where the VM and virtual NIC will be
+ # created.
+ ResourceGroup: ""
+
+ # (azure) The resource group of the Network to use for the virtual
+ # NIC (if different from ResourceGroup)
+ NetworkResourceGroup: ""
Network: ""
Subnet: ""
Network: ""
Subnet: ""
+
+ # (azure) managed disks: The resource group where the managed disk
+ # image can be found (if different from ResourceGroup).
+ ImageResourceGroup: ""
+
+ # (azure) unmanaged disks (deprecated): Where to store the VM VHD blobs
StorageAccount: ""
BlobContainer: ""
StorageAccount: ""
BlobContainer: ""
+
+ # (azure) How long to wait before deleting VHD and NIC
+ # objects that are no longer being used.
DeleteDanglingResourcesAfter: 20s
DeleteDanglingResourcesAfter: 20s
+
+ # Account (that already exists in the VM image) that will be
+ # set up with an ssh authorized key to allow the compute
+ # dispatcher to connect.
AdminUsername: arvados
InstanceTypes:
AdminUsername: arvados
InstanceTypes:
@@
-1072,6
+1096,8
@@
Clusters:
ConnectTimeout: 1m
ReadTimeout: 10m
RaceWindow: 24h
ConnectTimeout: 1m
ReadTimeout: 10m
RaceWindow: 24h
+ # Use aws-s3-go (v2) instead of goamz
+ UseAWSS3v2Driver: false
# For S3 driver, potentially unsafe tuning parameter,
# intentionally excluded from main documentation.
# For S3 driver, potentially unsafe tuning parameter,
# intentionally excluded from main documentation.