From ddb79f82e9a8ec70b6efa455314835660f743d23 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Mon, 21 Sep 2015 20:57:07 +0300 Subject: [PATCH] #730: more accurate chef bootstrap errors handling --- devops-service/lib/executors/server_executor.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/devops-service/lib/executors/server_executor.rb b/devops-service/lib/executors/server_executor.rb index 76ef3aa..ddb86e2 100644 --- a/devops-service/lib/executors/server_executor.rb +++ b/devops-service/lib/executors/server_executor.rb @@ -178,6 +178,7 @@ module Devops provider = @server.provider_instance @server.chef_node_name = provider.create_default_chef_node_name(@server) if @server.chef_node_name.nil? r = @knife_instance.knife_bootstrap(@out, ip, self.bootstrap_options(ja, options)) + if r == 0 @out << "Chef node name: #{@server.chef_node_name}\n" ::Devops::Db.connector.server_set_chef_node_name @server @@ -185,12 +186,14 @@ module Devops @out << "After bootstrap hooks...\n" res = self.run_hook(:after_bootstrap, @out) @out << "Done\n" + @out.flush DevopsLogger.logger.info "Server with id '#{@server.id}' is bootstraped" + r else @out << "Can not bootstrap node '#{@server.id}', error code: #{r}" + @out.flush + result_code(:server_bootstrap_fail) end - @out.flush - r end def bootstrap_options attributes, options