This commit is contained in:
amartynov 2015-11-06 14:00:24 +03:00
parent daaa73b8f4
commit 84822598a2

View File

@ -235,7 +235,8 @@ module Devops
if check_server
@out << "Server #{@server.chef_node_name} is created"
else
@out << roll_back
@out.puts "Can not find client or node on chef-server"
roll_back
@out.flush
mongo.server_delete @server.id
return result_code(:server_not_in_chef_nodes)
@ -429,13 +430,14 @@ module Devops
end
def roll_back
@out.puts "Trying to roll back..."
unless @server.id.nil?
@out << "Server '#{@server.chef_node_name}' with id '#{@server.id}' is not created\n"
@out << delete_from_chef_server(@server.chef_node_name).values.join("\n")
@out.puts "Server '#{@server.chef_node_name}' with id '#{@server.id}' is not created"
@out.puts delete_from_chef_server(@server.chef_node_name).values.join("\n")
begin
@out << @server.provider_instance.delete_server(@server)
@out.puts @server.provider_instance.delete_server(@server)
rescue => e
@out << e.message
@out.puts e.message
end
@out << "\nRolled back\n"
end