summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keiser <john@johnkeiser.com>2015-11-16 11:28:24 -0800
committerJohn Keiser <john@johnkeiser.com>2015-11-16 11:28:58 -0800
commit0344829524c43f2872fe54f8b89198d04441b44e (patch)
tree85b363ee2ea7314a71ef8917e87fc3b19897ff4b
parent85351c925cc550c209abfa2d590ff3a5f9892db5 (diff)
downloadchef-zero-cd/run-moar-pedant.tar.gz
Pass chef_config to ChefFS so that it knows we are a multi-org servercd/run-moar-pedant
-rw-r--r--spec/run_oc_pedant.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/run_oc_pedant.rb b/spec/run_oc_pedant.rb
index 254b7be..726279f 100644
--- a/spec/run_oc_pedant.rb
+++ b/spec/run_oc_pedant.rb
@@ -25,9 +25,9 @@ def start_cheffs_server(chef_repo_path)
Chef::Config.repo_mode = 'hosted_everything'
Chef::Config.chef_repo_path = chef_repo_path
Chef::Config.versioned_cookbooks = true
- chef_fs = Chef::ChefFS::Config.new.local_fs
+ chef_fs_config = Chef::ChefFS::Config.new
- data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs)
+ data_store = Chef::ChefFS::ChefFSDataStore.new(chef_fs_config.local_fs, chef_fs_config.chef_config)
data_store = ChefZero::DataStore::V1ToV2Adapter.new(data_store, 'pedant-testorg')
data_store = ChefZero::DataStore::DefaultFacade.new(data_store, 'pedant-testorg', false)
data_store.create(%w(organizations pedant-testorg users), 'pivotal', '{}')