Merge "Use a 'params' hash for authtoken parameters"

manifests/keystone/authtoken.pp

@@ -187,6 +187,10 @@
 #  "public", "internal" or "admin".
 #  Defaults to $::os_service_default.
 #
+# [*params*]
+#  (Optional) Hash of additional parameters to pass through to the keystone
+#  authtoken class. Values set here override the individual parameters above.
+#
 class barbican::keystone::authtoken(
   $password                       = $::os_service_default,
   $username                       = 'barbican',
@@ -224,6 +228,7 @@ class barbican::keystone::authtoken(
   $service_token_roles_required   = $::os_service_default,
   $service_type                   = $::os_service_default,
   $interface                      = $::os_service_default,
+  $params                         = {},
 ) {
 
   include barbican::deps
@@ -232,7 +237,10 @@ class barbican::keystone::authtoken(
     fail('Please set password for barbican service user')
   }
 
-  keystone::resource::authtoken { 'barbican_config':
+  keystone::resource::authtoken {
+    'barbican_config':
+      *                              => $params;
+    default:
       username                       => $username,
       password                       => $password,
       project_name                   => $project_name,
@@ -268,6 +276,6 @@ class barbican::keystone::authtoken(
       service_token_roles            => $service_token_roles,
       service_token_roles_required   => $service_token_roles_required,
       service_type                   => $service_type,
-    interface                      => $interface,
+      interface                      => $interface;
   }
 }

spec/classes/barbican_keystone_authtoken_spec.rb

@@ -152,6 +152,19 @@ describe 'barbican::keystone::authtoken' do
         is_expected.to contain_package('python-memcache')
       end
     end
+
+    context 'when overriding parameters via params hash' do
+      before do
+        params.merge!({
+          :username => 'myuser',
+          :params   => { 'username' => 'myotheruser' },
+        })
+      end
+
+      it 'configure keystone_authtoken' do
+        is_expected.to contain_barbican_config('keystone_authtoken/username').with_value(params[:params]['username'])
+      end
+    end
   end
 
   on_supported_os({