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

Merge branch 'neb_3148_unbootstrap_problems' into features

Browse Source
This commit is contained in:
Anton Chuchkalov 2015-12-21 14:05:42 +04:00
commit 089420e186
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,10 +213,7 @@ module Devops
DevopsLogger.logger.info msg DevopsLogger.logger.info msg
r r
else else
@out << "Can not bootstrap node '#{@server.id}', error code: #{r}\n" @out << "Can not bootstrap node '#{@server.id}', error code: #{r}"
if r == 256
@out << "Maybe old chef client configuration still exists?\n"
end
@out.flush @out.flush
result_code(:server_bootstrap_fail) result_code(:server_bootstrap_fail)
end end
@ -312,7 +309,7 @@ module Devops
k = Devops::Db.connector.key(@server.key) k = Devops::Db.connector.key(@server.key)
cert_path = k.path cert_path = k.path
i = 0 i = 0
res = {} res = delete_from_chef_server(@server.chef_node_name)
begin begin
new_name = "/etc/chef.backup_#{Time.now.strftime("%d-%m-%Y_%H.%M.%S")}" 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` # 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 retry unless i == 5
return {error: e.message} return {error: e.message}
end 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 end
def deploy_server_with_tags tags, deploy_info def deploy_server_with_tags tags, deploy_info