Merge branch 'neb_3148_unbootstrap_problems' into features

devops-service/lib/executors/server_executor.rb

@@ -213,7 +213,10 @@ module Devops
           DevopsLogger.logger.info msg
           r
         else
-          @out << "Can not bootstrap node '#{@server.id}', error code: #{r}"
+          @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.flush
           result_code(:server_bootstrap_fail)
         end
@@ -309,7 +312,7 @@ module Devops
         k = Devops::Db.connector.key(@server.key)
         cert_path = k.path
         i = 0
-        res = delete_from_chef_server(@server.chef_node_name)
+        res = {}
         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`
@@ -329,7 +332,9 @@ module Devops
           retry unless i == 5
           return {error: e.message}
         end
-        res
+
+        deleting_chef_node_and_chef_client_result = delete_from_chef_server(@server.chef_node_name)
+        res.merge!(deleting_chef_node_and_chef_client_result)
       end
 
       def deploy_server_with_tags tags, deploy_info