From fe2b99b80f0fcf20af8a5d4272bc67435e204150 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Mon, 21 Dec 2015 14:04:39 +0400 Subject: [PATCH] Revert "Unbootstrap: delete node from chef server only if /etc/chef directory was successfully moved" This reverts commit 57f5bf0f2e3e1b8a643f8e42aed5feca951032b5. --- devops-service/lib/executors/server_executor.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/devops-service/lib/executors/server_executor.rb b/devops-service/lib/executors/server_executor.rb index a8bda22..7ff7fdc 100644 --- a/devops-service/lib/executors/server_executor.rb +++ b/devops-service/lib/executors/server_executor.rb @@ -213,10 +213,7 @@ module Devops DevopsLogger.logger.info msg r else - @out << "Can not bootstrap node '#{@server.id}', error code: #{r}\n" - if r == 256 - @out << "Maybe old chef client configuration still exists?\n" - end + @out << "Can not bootstrap node '#{@server.id}', error code: #{r}" @out.flush result_code(:server_bootstrap_fail) end @@ -312,7 +309,7 @@ module Devops k = Devops::Db.connector.key(@server.key) cert_path = k.path i = 0 - res = {} + res = delete_from_chef_server(@server.chef_node_name) begin new_name = "/etc/chef.backup_#{Time.now.strftime("%d-%m-%Y_%H.%M.%S")}" # r = `ssh -i #{cert_path} -q #{@server.remote_user}@#{@server.private_ip} rm -Rf /etc/chef` @@ -332,9 +329,7 @@ module Devops retry unless i == 5 return {error: e.message} end - - deleting_chef_node_and_chef_client_result = delete_from_chef_server(@server.chef_node_name) - res.merge!(deleting_chef_node_and_chef_client_result) + res end def deploy_server_with_tags tags, deploy_info