From a7668328c1133c80f103954ddeb82e35d65c1694 Mon Sep 17 00:00:00 2001
From: Chris Doherty <cdoherty@chef.io>
Date: Tue, 10 Nov 2015 13:57:45 -0800
Subject: oc_pedant.rb: Add :key_file.

---
 spec/support/oc_pedant.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'spec/support/oc_pedant.rb')

diff --git a/spec/support/oc_pedant.rb b/spec/support/oc_pedant.rb
index 645b27c..c0d7648 100644
--- a/spec/support/oc_pedant.rb
+++ b/spec/support/oc_pedant.rb
@@ -86,6 +86,8 @@ def cheffs_or_else_user(value)
   ENV['CHEF_FS'] ? "pivotal" : value
 end
 
+keyfile_maybe = ENV['CHEF_FS'] ? { key_file: key } : { key_file: nil }
+
 requestors({
              :clients => {
                # The the admin user, for the purposes of getting things rolling
@@ -115,14 +117,14 @@ requestors({
                  :create_me => !ENV['CHEF_FS'],
                  :associate => !ENV['CHEF_FS'],
                  :create_knife => true
-               },
+               }.merge(keyfile_maybe),
 
                :non_admin => {
                  :name => cheffs_or_else_user("pedant_user"),
                  :create_me => !ENV['CHEF_FS'],
                  :associate => !ENV['CHEF_FS'],
                  :create_knife => true
-               },
+               }.merge(keyfile_maybe),
 
                # A user that is not a member of the testing organization
                :bad => {
@@ -130,7 +132,7 @@ requestors({
                  :create_me => !ENV['CHEF_FS'],
                  :create_knife => true,
                  :associate => false
-               },
+               }.merge(keyfile_maybe),
              }
            })
 
-- 
cgit v1.2.1