Merge "Allow customizing separator for api-paste.ini"

lib/puppet/type/barbican_api_paste_ini.rb

@@ -62,6 +62,11 @@ Puppet::Type.newtype(:barbican_api_paste_ini) do
     defaultto('<SERVICE DEFAULT>')
   end
 
+  newparam(:key_val_separator) do
+    desc 'The separator string to use between each setting name and value.'
+    defaultto('=')
+  end
+
   autorequire(:anchor) do
     ['barbican::install::end']
   end

manifests/api.pp

@@ -417,15 +417,13 @@ class barbican::api (
   # keystone config
   if $auth_strategy == 'keystone' {
     include barbican::keystone::authtoken
+    barbican_api_paste_ini {
+      'composite:main//v1': value => 'barbican-api-keystone', key_val_separator => ':';
+    }
   } else {
-    # TODO(tkajinam): We need to fix the barbican_api_paste_ini provider to
-    #                 support the following configuration.
-    #
-    #                 [composite:main]
-    #                 ...
-    #                 /v1: barbican_api
-    #
-    warning('The pipeline definiton should be updated manually when keystone is not used')
+    barbican_api_paste_ini {
+      'composite:main//v1': value => 'barbican_api', key_val_separator => ':';
+    }
   }
 
 

releasenotes/notes/api_paste_ini-separator-427d9eacb371d231.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The new ``key_val_separator`` attribute has been added to
+    the ``barbican_api_paste_ini`` resource type.