diff --git a/manifests/api.pp b/manifests/api.pp index 7a426fef..be19d29f 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -146,6 +146,11 @@ # stored when image import method is set to 'glance-direct' # Defaults to $::os_service_default. # +# [*worker_self_reference_url*] +# (optional) The self-reference URL by which other workers will get to know +# how to contact the worker which has staged the image. +# Defaults to $::os_service_default. +# # [*image_member_quota*] # (optional) The maximum number of image members allowed per image. # Defaults to $::os_service_default @@ -350,6 +355,7 @@ class glance::api( $image_conversion_output_format = $::os_service_default, $enabled_import_methods = $::os_service_default, $node_staging_uri = $::os_service_default, + $worker_self_reference_url = $::os_service_default, $image_member_quota = $::os_service_default, $task_time_to_live = $::os_service_default, $task_executor = $::os_service_default, @@ -483,6 +489,7 @@ removed in a future realse. Use glance::api::db::database_max_overflow instead') 'DEFAULT/image_cache_max_size': value => $image_cache_max_size; 'DEFAULT/enabled_import_methods': value => $enabled_import_methods_real; 'DEFAULT/node_staging_uri': value => $node_staging_uri; + 'DEFAULT/worker_self_reference_url': value => $worker_self_reference_url; 'DEFAULT/image_member_quota': value => $image_member_quota; 'DEFAULT/limit_param_default': value => $limit_param_default; 'DEFAULT/api_limit_max': value => $api_limit_max; diff --git a/releasenotes/notes/add_worker_self_reference_url_for_distributed_image_import-09f70f50c8c40def.yaml b/releasenotes/notes/add_worker_self_reference_url_for_distributed_image_import-09f70f50c8c40def.yaml new file mode 100644 index 00000000..3fcb7e2e --- /dev/null +++ b/releasenotes/notes/add_worker_self_reference_url_for_distributed_image_import-09f70f50c8c40def.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Add 'worker_self_reference_url' parameter to allow other glance workers + to contact the worker which has staged the image. diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb index 1f4ed783..fd92b408 100644 --- a/spec/classes/glance_api_spec.rb +++ b/spec/classes/glance_api_spec.rb @@ -30,6 +30,7 @@ describe 'glance::api' do :ignore_user_roles => '', :enabled_import_methods => '', :node_staging_uri => '', + :worker_self_reference_url => '', :image_member_quota => '', :image_cache_stall_time => '', :image_cache_max_size => '', @@ -71,6 +72,7 @@ describe 'glance::api' do :ignore_user_roles => 'admin', :enabled_import_methods => 'glance-direct,web-download', :node_staging_uri => '/tmp/staging', + :worker_self_reference_url => 'http://worker1', :image_member_quota => '128', :image_cache_stall_time => '10', :image_cache_max_size => '10737418240', @@ -128,6 +130,7 @@ describe 'glance::api' do 'image_cache_max_size', 'cache_prefetcher_interval', 'node_staging_uri', + 'worker_self_reference_url', 'image_member_quota', 'limit_param_default', 'api_limit_max',