Merge "Allow configuring distributed image import"

deployment/glance/glance-api-container-puppet.yaml

@@ -598,6 +598,9 @@ outputs:
             - tripleo::profile::base::glance::netapp::netapp_share: {get_param: NetappShareLocation}
               glance::api::filesystem_store_metadata_file: '/etc/glance/glance-metadata-file.json'
               glance::api::filesystem_store_file_perm: '0644'
+          - if:
+            - contains: ['glance-direct', {get_param: GlanceEnabledImportMethods}]
+            - glance::api::worker_self_reference_url: {get_param: [EndpointMap, GlanceInternal, uri_no_suffix]}
           - if:
             - not: {equals: [{get_param: GlanceDiskFormats}, []]}
             - glance::api::disk_formats: {get_param: GlanceDiskFormats}

deployment/glance/glance-api-edge-container-puppet.yaml

@@ -30,6 +30,12 @@ parameters:
   EnableInternalTLS:
     type: boolean
     default: false
+  GlanceEnabledImportMethods:
+    default: 'web-download'
+    description: >
+      List of enabled Image Import Methods. Valid values in the list are
+      'glance-direct', 'web-download', or 'copy-image'
+    type: comma_delimited_list
 
 resources:
   GlanceApiBase:
@@ -71,3 +77,9 @@ outputs:
                   cinder::glance::glance_api_servers: *glance_api_edge_uri
                 nova_compute:
                   nova::glance::endpoint_override: *glance_api_edge_uri
+          config_settings:
+            map_merge:
+              - get_attr: [GlanceApiBase, role_data, config_settings]
+              - if:
+                - contains: ['glance-direct', {get_param: GlanceEnabledImportMethods}]
+                - glance::api::worker_self_reference_url: *glance_api_edge_uri

releasenotes/notes/add_worker_self_reference_url_for_distributed_image_import-97458c56a1ad95d9.yaml

@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    To support Glance Distributed Image Import, adding configuration of
+    ``worker_self_reference_url`` by providing the internal API URL for
+    each node where glance api will run with glance-direct method of
+    image-import is enabled.