tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
Anton Martynov 2015-10-01 22:41:35 +03:00
parent f764db18ed
commit 11414241ea
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devops-service/lib/executors/server_executor.rb
View File

@ -446,11 +446,16 @@ module Devops
end end
def compute_run_list def compute_run_list
rlist = Set.new.merge(@deploy_env.provider_instance.run_list).merge(@project.run_list).merge(@deploy_env.run_list).merge(@server.run_list) rlist = []
[@deploy_env.provider_instance.run_list, @project.run_list, @deploy_env.run_list, @server.run_list].each do |sub_run_list|
rlist += sub_run_list if sub_run_list.is_a?(Array)
end
rlist = Set.new(rlist)
if @server.stack if @server.stack
stack = Devops::Db.connector.stack(@server.stack) stack = Devops::Db.connector.stack(@server.stack)
out << "Stack run list: #{stack.run_list.join(", ")}\n" out << "Stack run list: #{stack.run_list.join(", ")}\n"
rlist.merge(stack.run_list) srl = stack.run_list
rlist.merge(srl) if srl.is_a?(Array)
end end
rlist.to_a rlist.to_a
end end