From e26fa71311a0060b98dc902f9bf21e92572f0d51 Mon Sep 17 00:00:00 2001 From: amartynov Date: Fri, 6 Nov 2015 12:52:31 +0300 Subject: [PATCH] #840: two_phase_bootstrap option :deploy_info to override project deploy_info --- devops-service/lib/executors/server_executor.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/devops-service/lib/executors/server_executor.rb b/devops-service/lib/executors/server_executor.rb index 429bedb..88c9131 100644 --- a/devops-service/lib/executors/server_executor.rb +++ b/devops-service/lib/executors/server_executor.rb @@ -262,7 +262,7 @@ module Devops @out << "\nComputed run list: #{run_list.join(", ")}" @out.flush @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) if deploy_status == 0 0 @@ -352,8 +352,7 @@ module Devops deploy_info.delete("use_json_file") @out << "Deploy Input Parameters:\n" json = JSON.pretty_generate(deploy_info) - @out << json - @out << "\n" + @out.puts json file = "#{@server.project}_#{@server.deploy_env}_#{Time.new.to_i}" dir = DevopsConfig.config[:project_info_dir] File.open(File.join(dir, file), "w") do |f|