openstack/fuel-main
Code Issues Proposed changes

[naily] Fix progress calculation while provisioning.

Browse Source
This commit is contained in:
Andrey Danin 2012-12-27 16:49:22 +04:00 committed by default
parent 7d4f38e05b
commit 15216bcb7c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
naily/lib/naily/dispatcher.rb
View File

@ -32,6 +32,7 @@ module Naily
def deploy(data) def deploy(data)
reporter = Naily::Reporter.new(@producer, data['respond_to'], data['args']['task_uuid']) reporter = Naily::Reporter.new(@producer, data['respond_to'], data['args']['task_uuid'])
nodes = data['args']['nodes'] nodes = data['args']['nodes']
nodes_uids = nodes.map { |n| n['uid'] }
time = Time::now.to_f time = Time::now.to_f
nodes_not_booted = nodes.map { |n| n['uid'] } nodes_not_booted = nodes.map { |n| n['uid'] }
Naily.logger.info "Starting OS provisioning for nodes: #{nodes_not_booted.join(',')}" Naily.logger.info "Starting OS provisioning for nodes: #{nodes_not_booted.join(',')}"
@ -53,9 +54,9 @@ module Naily
Naily.logger.info "All nodes #{target_uids.join(',')} are provisioned." Naily.logger.info "All nodes #{target_uids.join(',')} are provisioned."
break break
end end
nodes_not_booted = nodes.map { |n| n['uid'] } - types.map { |n| n['uid'] } nodes_not_booted = nodes_uids - types.map { |n| n['uid'] }
begin begin
nodes_progress = @provisionLogParser.progress_calculate(nodes) nodes_progress = @provisionLogParser.progress_calculate(nodes_uids, nodes)
nodes_progress.each do |n| nodes_progress.each do |n|
if target_uids.include?(n['uid']) if target_uids.include?(n['uid'])
n['progress'] = 100 n['progress'] = 100