From: Ward Vandewege <ward@curii.com>
Date: Tue, 4 Aug 2020 19:45:07 +0000 (-0400)
Subject: Merge branch 'master' into 10477-upgrade-aws-s3-driver
X-Git-Tag: 2.1.0~144^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/9c03bedaa6aa6a64b42dc61efcd6d46154fe6732?hp=-c

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

refs #10477

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

9c03bedaa6aa6a64b42dc61efcd6d46154fe6732
diff --combined lib/config/config.default.yml
index 01d399943a,96291a2d4b..a2a34448f1
--- a/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 508652a8aa,2790477e4a..bddb5cedb1
--- a/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.