projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 10477-upgrade-aws-s3-driver
[arvados.git]
/
lib
/
config
/
generated_config.go
diff --git
a/lib/config/generated_config.go
b/lib/config/generated_config.go
index 508652a8aab473628b135e351f146905ef94c606..bddb5cedb1df8428024f6461ed52ede12d8b9607 100644
(file)
--- a/
lib/config/generated_config.go
+++ b/
lib/config/generated_config.go
@@
-1014,13
+1014,29
@@
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) 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: