16625: Merge branch 'master' into 16625-add-azure-managed-image-support

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

diff --combined lib/config/config.default.yml
index 02bb3525e17c78cd4f434a41895f660c5ee32250,cc871087c31f0f13405430683553c7256e77e819..89156719b2f34be76ca02ed58e83867514d1d1e2
--- 1/lib/config/config.default.yml
--- 2/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@@ -139,9 -139,6 +139,6 @@@ Clusters
        Workbench2:
          InternalURLs: {}
          ExternalURL: ""
-       Nodemanager:
-         InternalURLs: {}
-         ExternalURL: "-"
        Health:
          InternalURLs: {}
          ExternalURL: "-"
@@@ -486,6 -483,9 +483,9 @@@
        # Use of this feature is not recommended, if it can be avoided.
        ForwardSlashNameSubstitution: ""
  
+       # Include "folder objects" in S3 ListObjects responses.
+       S3FolderObjects: true
+ 
        # Managed collection properties. At creation time, if the client didn't
        # provide the listed keys, they will be automatically populated following
        # one of the following behaviors:
@@@ -952,10 -952,6 +952,10 @@@
          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
@@@ -1024,11 -1020,7 +1024,11 @@@
            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 (deprecated): Where to store the VM VHD blobs
            StorageAccount: ""
            BlobContainer: ""
  

diff --combined lib/config/generated_config.go
index 81f02349c3669eed2e8e10df61cf83d57d800a53,0374ff7c7b14dd9188b58ae149e98f8fdafb4d94..f0582f948fa6b805d0b7ead117b9673907b96d3d
--- 1/lib/config/generated_config.go
--- 2/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@@ -145,9 -145,6 +145,6 @@@ Clusters
        Workbench2:
          InternalURLs: {}
          ExternalURL: ""
-       Nodemanager:
-         InternalURLs: {}
-         ExternalURL: "-"
        Health:
          InternalURLs: {}
          ExternalURL: "-"
@@@ -492,6 -489,9 +489,9 @@@
        # Use of this feature is not recommended, if it can be avoided.
        ForwardSlashNameSubstitution: ""
  
+       # Include "folder objects" in S3 ListObjects responses.
+       S3FolderObjects: true
+ 
        # Managed collection properties. At creation time, if the client didn't
        # provide the listed keys, they will be automatically populated following
        # one of the following behaviors:
@@@ -958,10 -958,6 +958,10 @@@
          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
@@@ -1030,11 -1026,7 +1030,11 @@@
            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 (deprecated): Where to store the VM VHD blobs
            StorageAccount: ""
            BlobContainer: ""