modules/mu/groomers/chef.rb in cloud-mu-1.9.0.pre.beta vs modules/mu/groomers/chef.rb in cloud-mu-2.0.0.pre.alpha
- old
+ new
@@ -251,21 +251,20 @@
# session.
# @param purpose [String]: A string describing the purpose of this client run.
# @param max_retries [Integer]: The maximum number of attempts at a successful run to make before giving up.
# @param output [Boolean]: Display Chef's regular (non-error) output to the console
# @param override_runlist [String]: Use the specified run list instead of the node's configured list
- def run(purpose: "Chef run", update_runlist: true, max_retries: 5, output: true, override_runlist: nil, reboot_first_fail: false)
+ def run(purpose: "Chef run", update_runlist: true, max_retries: 5, output: true, override_runlist: nil, reboot_first_fail: false, timeout: 1800)
self.class.loadChefLib
if update_runlist and !@config['run_list'].nil?
knifeAddToRunList(multiple: @config['run_list'])
end
- timeout = @server.windows? ? 1800 : 600
pending_reboot_count = 0
chef_node = ::Chef::Node.load(@server.mu_name)
if !@config['application_attributes'].nil?
MU.log "Setting node:#{@server.mu_name} application_attributes", MU::DEBUG, details: @config['application_attributes']
- chef_node.normal.application_attributes = @config['application_attributes']
+ chef_node.normal['application_attributes'] = @config['application_attributes']
chef_node.save
end
if @server.deploy.original_config.has_key?('parameters')
MU.log "Setting node:#{@server.mu_name} parameters", MU::DEBUG, details: @server.deploy.original_config['parameters']
chef_node.normal['mu_parameters'] = @server.deploy.original_config['parameters']