roll_back moved to commands/server.rb

This commit is contained in:
amartynov 2014-05-23 17:58:49 +04:00
parent adda39e046
commit 24dd007f2c
2 changed files with 15 additions and 15 deletions

View File

@ -187,4 +187,19 @@ module ServerCommands
return info, r return info, r
end end
def roll_back s, provider
str = ""
unless s.id.nil?
str << "Server '#{s.chef_node_name}' with id '#{s.id}' is not created\n"
str << delete_from_chef_server(s.chef_node_name).values.join("\n")
begin
str << provider.delete_server(s.id) unless s.static
rescue => e
str << e.message
end
str << "\nRolled back\n"
end
return str
end
end end

View File

@ -480,21 +480,6 @@ module Version2_0
key == "instance" ? BaseRoutes.mongo.server_by_instance_id(id) : BaseRoutes.mongo.server_by_chef_node_name(id) key == "instance" ? BaseRoutes.mongo.server_by_instance_id(id) : BaseRoutes.mongo.server_by_chef_node_name(id)
end end
def roll_back s, provider
str = ""
unless s.id.nil?
str << "Server '#{s.chef_node_name}' with id '#{s.id}' is not created\n"
str << delete_from_chef_server(s.chef_node_name).values.join("\n")
begin
str << provider.delete_server(s.id) unless s.static
rescue => e
str << e.message
end
str << "\nRolled back\n"
end
return str
end
def check_chef_node_name name, provider def check_chef_node_name name, provider
BaseRoutes.mongo.server_by_chef_node_name name BaseRoutes.mongo.server_by_chef_node_name name
halt(400, "Server with name '#{name}' already exist") halt(400, "Server with name '#{name}' already exist")