openstack
/
puppet-glance
Code Issues Proposed changes

Simplfy logic to generate list opts 

Change-Id: Ia0f0fd0c6633e658c20351cf1e1d62a495361552
This commit is contained in:
Takashi Kajinami 2020-10-12 19:21:00 +09:00
parent e49a829eca
commit 4af7ebd6bc
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/api.pp
View File

@ -581,24 +581,11 @@ enabled_backends instead.')
$image_import_plugins_real = $image_import_plugins $image_import_plugins_real = $image_import_plugins
} }
if $inject_metadata_properties != $::os_service_default {
$inject_metadata_properties_real = join(any2array($inject_metadata_properties), ',')
} else {
$inject_metadata_properties_real = $inject_metadata_properties
}
if $ignore_user_roles != $::os_service_default {
$ignore_user_roles_real = join(any2array($ignore_user_roles), ',')
} else {
$ignore_user_roles_real = $ignore_user_roles
}
glance_image_import_config { glance_image_import_config {
'image_import_opts/image_import_plugins': value => $image_import_plugins_real; 'image_import_opts/image_import_plugins': value => $image_import_plugins_real;
'image_conversion/output_format': value => $image_conversion_output_format; 'image_conversion/output_format': value => $image_conversion_output_format;
'inject_metadata_properties/inject': value => $inject_metadata_properties_real; 'inject_metadata_properties/inject': value => $inject_metadata_properties;
'inject_metadata_properties/ignore_user_roles': value => $ignore_user_roles_real; 'inject_metadata_properties/ignore_user_roles': value => $ignore_user_roles;
} }
# Set the pipeline, it is allowed to be blank # Set the pipeline, it is allowed to be blank