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

#840: two_phase_bootstrap option :deploy_info to override project deploy_info

Browse Source
This commit is contained in:
amartynov 2015-11-06 12:52:31 +03:00
parent d2bbe96f16
commit e26fa71311
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -262,7 +262,7 @@ module Devops
@out << "\nComputed run list: #{run_list.join(", ")}" @out << "\nComputed run list: #{run_list.join(", ")}"
@out.flush @out.flush
@knife_instance.set_run_list(@server.chef_node_name, run_list) @knife_instance.set_run_list(@server.chef_node_name, run_list)
deploy_info = @project.deploy_info(@deploy_env) deploy_info = options[:deploy_info] || @project.deploy_info(@deploy_env)
deploy_status = deploy_server(deploy_info) deploy_status = deploy_server(deploy_info)
if deploy_status == 0 if deploy_status == 0
0 0
@ -352,8 +352,7 @@ module Devops
deploy_info.delete("use_json_file") deploy_info.delete("use_json_file")
@out << "Deploy Input Parameters:\n" @out << "Deploy Input Parameters:\n"
json = JSON.pretty_generate(deploy_info) json = JSON.pretty_generate(deploy_info)
@out << json @out.puts json
@out << "\n"
file = "#{@server.project}_#{@server.deploy_env}_#{Time.new.to_i}" file = "#{@server.project}_#{@server.deploy_env}_#{Time.new.to_i}"
dir = DevopsConfig.config[:project_info_dir] dir = DevopsConfig.config[:project_info_dir]
File.open(File.join(dir, file), "w") do |f| File.open(File.join(dir, file), "w") do |f|