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

fix deleting servers after stack deleting

Browse Source
This commit is contained in:
Anton Chuchkalov 2015-08-31 14:26:16 +03:00
parent 7b762dfa98
commit 6824280225
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devops-service/app/api2/handlers/stack.rb
View File

@ -39,9 +39,6 @@ module Devops
raise InvalidRecord.new("Environment '#{env.identifier}' of project '#{project.id}' has no stack template") if env.stack_template.nil? raise InvalidRecord.new("Environment '#{env.identifier}' of project '#{project.id}' has no stack template") if env.stack_template.nil?
object["stack_template"] = env.stack_template object["stack_template"] = env.stack_template
object["owner"] = parser.current_user object["owner"] = parser.current_user
# stack_model = Model::StackFactory.create(env.provider, object)
# stack_model.owner = owner_from_request
#Devops::Db.connector.stack_insert(stack_model)
file = JobStarter.start_job(:worker, :stack_bootstrap, file = JobStarter.start_job(:worker, :stack_bootstrap,
provider: env.provider, provider: env.provider,
@ -59,7 +56,7 @@ module Devops
def delete_stack name def delete_stack name
stack = self.stack(name) stack = self.stack(name)
stack.delete_stack_in_cloud! stack.delete_stack_in_cloud!
Devops::Db.connector.stack_servers_delete(stack.id) Devops::Db.connector.stack_servers_delete(stack.name)
Devops::Db.connector.stack_delete(stack.id) Devops::Db.connector.stack_delete(stack.id)
end end

13
devops-service/providers/openstack.rb
View File

@ -251,7 +251,18 @@ module Provider
end end
def stack_servers(stack) def stack_servers(stack)
stack_resources(stack).map{|r| compute.servers.get(r['physical_resource_id'])} stack_resources(stack).map do |r|
server = compute.servers.get(r['physical_resource_id'])
net = server.addresses.first
ip = net.last.first['addr']
{
'name' => server.name,
'id' => server.id,
'key_name' => server.key_name,
'private_ip' => ip,
'public_ip' => ip
}
end
end end
private private

4
devops-service/workers/stack_bootstrap_worker.rb
View File

@ -50,7 +50,7 @@ class StackBootstrapWorker < Worker
project = mongo.project(stack.project) project = mongo.project(stack.project)
deploy_env = project.deploy_env(stack.deploy_env) deploy_env = project.deploy_env(stack.deploy_env)
provider.stack_servers(stack).map do |extended_info | provider.stack_servers(stack).map do |extended_info|
server_attrs = { server_attrs = {
'provider' => provider.name, 'provider' => provider.name,
'project' => project.id, 'project' => project.id,
@ -68,7 +68,7 @@ class StackBootstrapWorker < Worker
server = ::Devops::Model::Server.new(server_attrs) server = ::Devops::Model::Server.new(server_attrs)
mongo.server_insert(server) mongo.server_insert(server)
# server.chef_node_name = provider.create_default_chef_node_name(server) # server.chef_node_name = provider.create_default_chef_node_name(server)
server server
end end
end end