summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Hinderliter <tim@opscode.com>2011-03-22 17:02:11 -0700
committerTim Hinderliter <tim@opscode.com>2011-03-22 17:02:11 -0700
commitb64e642adc8c832b81aa2b408c0d2a9d931cb5ab (patch)
treef758367b1a0561abdbe1030eb2064c19caafd733
parente4463d5c703141f87cbc329d410d446ed420e7ae (diff)
downloadchef-b64e642adc8c832b81aa2b408c0d2a9d931cb5ab.tar.gz
Fixed shef_session to correspond to new RunListFrom{API/Disk} API
-rw-r--r--chef/lib/chef/shef/shef_session.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/chef/lib/chef/shef/shef_session.rb b/chef/lib/chef/shef/shef_session.rb
index 49564a0f19..4a088b2e5a 100644
--- a/chef/lib/chef/shef/shef_session.rb
+++ b/chef/lib/chef/shef/shef_session.rb
@@ -24,6 +24,7 @@ require 'chef/config'
require 'chef/client'
require 'chef/cookbook/cookbook_collection'
require 'chef/cookbook_loader'
+require 'chef/run_list/run_list_expansion'
module Shef
class ShefSession
@@ -137,7 +138,7 @@ module Shef
def rebuild_context
@run_context = Chef::RunContext.new(@node, {}) # no recipes
- @run_context.load(RunListExpansionFromDisk.new) # empty recipe list
+ @run_context.load(Chef::RunList::RunListExpansionFromDisk.new("_default", [])) # empty recipe list
end
private
@@ -162,7 +163,7 @@ module Shef
def rebuild_context
Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::FileSystemFileVendor.new(manifest) }
@run_context = Chef::RunContext.new(@node, Chef::CookbookCollection.new(Chef::CookbookLoader.new))
- @run_context.load(RunListExpansionFromDisk.new)
+ @run_context.load(Chef::RunList::RunListExpansionFromDisk.new("_default", []))
run_status.run_context = run_context
end
@@ -191,7 +192,7 @@ module Shef
Chef::Cookbook::FileVendor.on_create { |manifest| Chef::Cookbook::RemoteFileVendor.new(manifest, Chef::REST.new(Chef::Config[:server_url])) }
cookbook_hash = @client.sync_cookbooks
@run_context = Chef::RunContext.new(node, Chef::CookbookCollection.new(cookbook_hash))
- @run_context.load(RunListExpansionFromAPI.new)
+ @run_context.load(Chef::RunList::RunListExpansionFromAPI.new("_default", []))
@run_status.run_context = run_context
end