Merge branch 'master' into 10477-upgrade-aws-s3-driver

refs #10477

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --combined lib/config/config.default.yml
index 01d399943a20c10b2844fb0588dcd03579307fd2,96291a2d4b9bdd2a7ce3341feb9c0e8254cc4879..a2a34448f11cced6b01a6343eb56acc314e5556c
--- 1/lib/config/config.default.yml
--- 2/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -1008,13 -1008,29 +1008,29 @@@ Clusters
  
            # (azure) Instance configuration.
            CloudEnvironment: AzurePublicCloud
-           ResourceGroup: ""
            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: ""
+ 
+           # (azure) Where to store the VM VHD blobs
            StorageAccount: ""
            BlobContainer: ""
+ 
+           # (azure) How long to wait before deleting VHD and NIC
+           # objects that are no longer being used.
            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:
@@@ -1072,8 -1088,6 +1088,8 @@@
            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.

diff --combined lib/config/generated_config.go
index 508652a8aab473628b135e351f146905ef94c606,2790477e4a9c46da6d6c859334b834e5ea888690..bddb5cedb1df8428024f6461ed52ede12d8b9607
--- 1/lib/config/generated_config.go
--- 2/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@@ -1014,13 -1014,29 +1014,29 @@@ Clusters
  
            # (azure) Instance configuration.
            CloudEnvironment: AzurePublicCloud
-           ResourceGroup: ""
            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: ""
+ 
+           # (azure) Where to store the VM VHD blobs
            StorageAccount: ""
            BlobContainer: ""
+ 
+           # (azure) How long to wait before deleting VHD and NIC
+           # objects that are no longer being used.
            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:
@@@ -1078,8 -1094,6 +1094,8 @@@
            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.