diff --git a/devops-service/commands/server.rb b/devops-service/commands/server.rb index 925fc7a..ae39936 100644 --- a/devops-service/commands/server.rb +++ b/devops-service/commands/server.rb @@ -187,4 +187,19 @@ module ServerCommands return info, r 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 diff --git a/devops-service/routes/v2.0/server.rb b/devops-service/routes/v2.0/server.rb index 4e2531e..66c2078 100644 --- a/devops-service/routes/v2.0/server.rb +++ b/devops-service/routes/v2.0/server.rb @@ -480,21 +480,6 @@ module Version2_0 key == "instance" ? BaseRoutes.mongo.server_by_instance_id(id) : BaseRoutes.mongo.server_by_chef_node_name(id) 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 BaseRoutes.mongo.server_by_chef_node_name name halt(400, "Server with name '#{name}' already exist")