From 0344829524c43f2872fe54f8b89198d04441b44e Mon Sep 17 00:00:00 2001 From: John Keiser Date: Mon, 16 Nov 2015 11:28:24 -0800 Subject: Pass chef_config to ChefFS so that it knows we are a multi-org server --- spec/run_oc_pedant.rb | 4 ++-- 1 file 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', '{}') -- cgit v1.2.1