From af63c9693effff165e970c7298e81518c5635163 Mon Sep 17 00:00:00 2001 From: amartynov Date: Wed, 19 Aug 2015 16:52:01 +0300 Subject: [PATCH] list stack servers --- devops-service/app/api2/handlers/stack.rb | 5 +++++ devops-service/app/api2/routes/stack.rb | 5 +++++ devops-service/workers/stack_bootstrap_worker.rb | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/devops-service/app/api2/handlers/stack.rb b/devops-service/app/api2/handlers/stack.rb index adca032..1a2d2b2 100644 --- a/devops-service/app/api2/handlers/stack.rb +++ b/devops-service/app/api2/handlers/stack.rb @@ -71,6 +71,11 @@ module Devops stack end + def stack_servers name + stack = Devops::Db.connector.stack(name) + Devops::Db.connector.stack_servers(stack.id) + end + def resources id stack = Devops::Db.connector.stack(id) stack.resources diff --git a/devops-service/app/api2/routes/stack.rb b/devops-service/app/api2/routes/stack.rb index 142bc31..b04c06f 100644 --- a/devops-service/app/api2/routes/stack.rb +++ b/devops-service/app/api2/routes/stack.rb @@ -16,6 +16,11 @@ module Devops json Devops::API2_0::Handler::Stack.new(request).stacks_for_provider(provider).map(&:to_hash) end + app.get_with_headers '/stack/:name/servers', :headers => [:accept] do |name| + check_privileges("stack", "r") + json Devops::API2_0::Handler::Stack.new(request).stack_servers(name).map(&:to_hash) + end + app.post_with_headers "/stack", :headers => [:accept, :content_type] do check_privileges("stack", "w") json Devops::API2_0::Handler::Stack.new(request).create_stack diff --git a/devops-service/workers/stack_bootstrap_worker.rb b/devops-service/workers/stack_bootstrap_worker.rb index 1d16e2d..960e5aa 100644 --- a/devops-service/workers/stack_bootstrap_worker.rb +++ b/devops-service/workers/stack_bootstrap_worker.rb @@ -32,7 +32,6 @@ class StackBootstrapWorker < Worker out << "\nStack '#{stack.name}' has been created\n" out.flush servers = persist_stack_servers!(stack, provider) - out << attrs.inspect out << "\n" unless attrs['without_bootstrap'] statuses = servers.map do |s|