openstack
/
puppet-glance
Code Issues Proposed changes

Add ability to configure enabled_import_methods 

Add new option glance::api::enabled_import_methods to support configuring
the list of enabled Image Import Methods.

Related-Bug: #1765439
Change-Id: Iea65b5e8a512d6a54cc88beb34d285ac797c58a9
(cherry picked from commit e223cc5d6b)
This commit is contained in:
Alan Bishop 2018-05-10 11:49:40 -04:00
parent 9cdd3df139
commit d44859c6fd
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/api.pp
View File

@ -190,6 +190,10 @@
# (optional) Base directory that the Image Cache uses. # (optional) Base directory that the Image Cache uses.
# Defaults to '/var/lib/glance/image-cache'. # 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*] # [*node_staging_uri*]
# (optional) The URL provides location where the temporary data will be # (optional) The URL provides location where the temporary data will be
# stored when image import method is set to 'glance-direct' # 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_max_size = $::os_service_default,
$image_cache_stall_time = $::os_service_default, $image_cache_stall_time = $::os_service_default,
$image_cache_dir = '/var/lib/glance/image-cache', $image_cache_dir = '/var/lib/glance/image-cache',
$enabled_import_methods = $::os_service_default,
$node_staging_uri = $::os_service_default, $node_staging_uri = $::os_service_default,
$image_member_quota = $::os_service_default, $image_member_quota = $::os_service_default,
$task_time_to_live = $::os_service_default, $task_time_to_live = $::os_service_default,
@ -404,6 +409,7 @@ class glance::api(
'DEFAULT/scrub_time': value => $scrub_time; 'DEFAULT/scrub_time': value => $scrub_time;
'DEFAULT/delayed_delete': value => $delayed_delete; 'DEFAULT/delayed_delete': value => $delayed_delete;
'DEFAULT/image_cache_dir': value => $image_cache_dir; '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/node_staging_uri': value => $node_staging_uri;
'DEFAULT/image_member_quota': value => $image_member_quota; 'DEFAULT/image_member_quota': value => $image_member_quota;
'DEFAULT/enable_v1_api': value => $enable_v1_api; 'DEFAULT/enable_v1_api': value => $enable_v1_api;

5
releasenotes/notes/add-enabled_import_methods-9deed747fea00cff.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
Add new option glance::api::enabled_import_methods.
This option specifies the list of enabled Image Import Methods.

3
spec/classes/glance_api_spec.rb
View File

@ -32,6 +32,7 @@ describe 'glance::api' do
:scrub_time => '<SERVICE DEFAULT>', :scrub_time => '<SERVICE DEFAULT>',
:default_store => false, :default_store => false,
:image_cache_dir => '/var/lib/glance/image-cache', :image_cache_dir => '/var/lib/glance/image-cache',
:enabled_import_methods => '<SERVICE DEFAULT>',
:node_staging_uri => '<SERVICE DEFAULT>', :node_staging_uri => '<SERVICE DEFAULT>',
:image_member_quota => '<SERVICE DEFAULT>', :image_member_quota => '<SERVICE DEFAULT>',
:image_cache_stall_time => '<SERVICE DEFAULT>', :image_cache_stall_time => '<SERVICE DEFAULT>',
@ -71,6 +72,7 @@ describe 'glance::api' do
:delayed_delete => 'true', :delayed_delete => 'true',
:scrub_time => '10', :scrub_time => '10',
:image_cache_dir => '/tmp/glance', :image_cache_dir => '/tmp/glance',
:enabled_import_methods => 'glance-direct,web-download',
:node_staging_uri => '/tmp/staging', :node_staging_uri => '/tmp/staging',
:image_member_quota => '128', :image_member_quota => '128',
:image_cache_stall_time => '10', :image_cache_stall_time => '10',
@ -130,6 +132,7 @@ describe 'glance::api' do
'delayed_delete', 'delayed_delete',
'scrub_time', 'scrub_time',
'image_cache_dir', 'image_cache_dir',
'enabled_import_methods',
'node_staging_uri', 'node_staging_uri',
'image_member_quota', 'image_member_quota',
'enable_v1_api', 'enable_v1_api',