From 4af7ebd6bc9d96680f2b8eaf239d051c67bb30d9 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 12 Oct 2020 19:21:00 +0900
Subject: [PATCH] Simplfy logic to generate list opts

Change-Id: Ia0f0fd0c6633e658c20351cf1e1d62a495361552
---
 manifests/api.pp | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/manifests/api.pp b/manifests/api.pp
index 12be1abf..26789ee8 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -581,24 +581,11 @@ enabled_backends instead.')
     $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 {
     'image_import_opts/image_import_plugins':       value => $image_import_plugins_real;
     'image_conversion/output_format':               value => $image_conversion_output_format;
-    'inject_metadata_properties/inject':            value => $inject_metadata_properties_real;
-    'inject_metadata_properties/ignore_user_roles': value => $ignore_user_roles_real;
+    'inject_metadata_properties/inject':            value => $inject_metadata_properties;
+    'inject_metadata_properties/ignore_user_roles': value => $ignore_user_roles;
   }
 
   # Set the pipeline, it is allowed to be blank