diff --git a/manifests/api.pp b/manifests/api.pp index 589a2ebe..a532e84f 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -190,6 +190,10 @@ # (optional) Base directory that the Image Cache uses. # Defaults to '/var/lib/glance/image-cache'. # +# [*enabled_import_methods*] +# (optional) The list of enabled Image Import Methods. +# Defaults to $::os_service_default. +# # [*node_staging_uri*] # (optional) The URL provides location where the temporary data will be # stored when image import method is set to 'glance-direct' @@ -348,6 +352,7 @@ class glance::api( $image_cache_max_size = $::os_service_default, $image_cache_stall_time = $::os_service_default, $image_cache_dir = '/var/lib/glance/image-cache', + $enabled_import_methods = $::os_service_default, $node_staging_uri = $::os_service_default, $image_member_quota = $::os_service_default, $task_time_to_live = $::os_service_default, @@ -404,6 +409,7 @@ class glance::api( 'DEFAULT/scrub_time': value => $scrub_time; 'DEFAULT/delayed_delete': value => $delayed_delete; 'DEFAULT/image_cache_dir': value => $image_cache_dir; + 'DEFAULT/enabled_import_methods': value => $enabled_import_methods; 'DEFAULT/node_staging_uri': value => $node_staging_uri; 'DEFAULT/image_member_quota': value => $image_member_quota; 'DEFAULT/enable_v1_api': value => $enable_v1_api; diff --git a/releasenotes/notes/add-enabled_import_methods-9deed747fea00cff.yaml b/releasenotes/notes/add-enabled_import_methods-9deed747fea00cff.yaml new file mode 100644 index 00000000..9173a040 --- /dev/null +++ b/releasenotes/notes/add-enabled_import_methods-9deed747fea00cff.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Add new option glance::api::enabled_import_methods. + This option specifies the list of enabled Image Import Methods. diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb index 5a40ff5f..335ef1fc 100644 --- a/spec/classes/glance_api_spec.rb +++ b/spec/classes/glance_api_spec.rb @@ -32,6 +32,7 @@ describe 'glance::api' do :scrub_time => '', :default_store => false, :image_cache_dir => '/var/lib/glance/image-cache', + :enabled_import_methods => '', :node_staging_uri => '', :image_member_quota => '', :image_cache_stall_time => '', @@ -71,6 +72,7 @@ describe 'glance::api' do :delayed_delete => 'true', :scrub_time => '10', :image_cache_dir => '/tmp/glance', + :enabled_import_methods => 'glance-direct,web-download', :node_staging_uri => '/tmp/staging', :image_member_quota => '128', :image_cache_stall_time => '10', @@ -130,6 +132,7 @@ describe 'glance::api' do 'delayed_delete', 'scrub_time', 'image_cache_dir', + 'enabled_import_methods', 'node_staging_uri', 'image_member_quota', 'enable_v1_api',