diff options
| author | Chris Doherty <cdoherty@chef.io> | 2015-11-10 13:57:45 -0800 |
|---|---|---|
| committer | Chris Doherty <cdoherty@chef.io> | 2015-11-10 15:12:04 -0800 |
| commit | a7668328c1133c80f103954ddeb82e35d65c1694 (patch) | |
| tree | 47733f359e99f07a8a44dca05ed4df319bdcad95 | |
| parent | 1f842beed8941a4cc6500786703c51445d30dba1 (diff) | |
| download | chef-zero-a7668328c1133c80f103954ddeb82e35d65c1694.tar.gz | |
oc_pedant.rb: Add :key_file.
| -rw-r--r-- | spec/support/oc_pedant.rb | 8 |
1 files changed, 5 insertions, 3 deletions
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), } }) |