projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16625: a-d-c: add support for Azure managed images. Update our packer
[arvados.git]
/
lib
/
config
/
generated_config.go
diff --git
a/lib/config/generated_config.go
b/lib/config/generated_config.go
index bddb5cedb1df8428024f6461ed52ede12d8b9607..a14f18aaec48cc92c333fb8d98ccd2635142dcdc 100644
(file)
--- a/
lib/config/generated_config.go
+++ b/
lib/config/generated_config.go
@@
-958,6
+958,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: 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
@@
-1026,7
+1030,11
@@
Clusters:
Network: ""
Subnet: ""
Network: ""
Subnet: ""
- # (azure) Where to store the VM VHD blobs
+ # (azure) managed disks: The resource group where the managed disk
+ # image can be found (if different from ResourceGroup).
+ ImageResourceGroup: ""
+
+ # (azure) unmanaged disks: Where to store the VM VHD blobs
StorageAccount: ""
BlobContainer: ""
StorageAccount: ""
BlobContainer: ""