diff options
| author | danielsdeleo <dan@opscode.com> | 2014-02-03 15:54:50 -0800 |
|---|---|---|
| committer | danielsdeleo <dan@opscode.com> | 2014-02-03 17:00:48 -0800 |
| commit | 196a36ed5e8d6a2c4ba8703d53ed0f6fd9e5922e (patch) | |
| tree | f7fedd3b65675a110bf137267850241383cd8476 /lib/chef/client.rb | |
| parent | d472efe27b3c9cd77902002f4158969d5d9eda15 (diff) | |
| download | chef-196a36ed5e8d6a2c4ba8703d53ed0f6fd9e5922e.tar.gz | |
[CHEF-3506] suppress final node save when using override run list
Diffstat (limited to 'lib/chef/client.rb')
| -rw-r--r-- | lib/chef/client.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/chef/client.rb b/lib/chef/client.rb index cb4a9e1224..722c9915e9 100644 --- a/lib/chef/client.rb +++ b/lib/chef/client.rb @@ -265,12 +265,12 @@ class Chef def save_updated_node - unless Chef::Config[:solo] + if Chef::Config[:solo] + # nothing to do + elsif policy_builder.temporary_policy? + Chef::Log.warn("Skipping final node save because override_runlist was given") + else Chef::Log.debug("Saving the current state of node #{node_name}") - if(@original_runlist) - @node.run_list(*@original_runlist) - @node.automatic_attrs[:runlist_override_history] = {Time.now.to_i => @override_runlist.inspect} - end @node.save end end |