diff --git a/devops-service/app/api2/routes/stack_template.rb b/devops-service/app/api2/routes/stack_template.rb index aa8a4db..d825191 100644 --- a/devops-service/app/api2/routes/stack_template.rb +++ b/devops-service/app/api2/routes/stack_template.rb @@ -26,7 +26,7 @@ module Devops hash['GET'] = lambda {|stack_template_id| check_privileges('stack_template', 'r') - json Devops::API2_0::Handler::StackTemplate.new(request).stack_template(stack_template_id).to_hash + json Devops::API2_0::Handler::StackTemplate.new(request).get_stack_template(stack_template_id).to_hash } hash['DELETE'] = lambda {|stack_template_id| diff --git a/devops-service/lib/executors/server_executor.rb b/devops-service/lib/executors/server_executor.rb index b119567..16cf190 100644 --- a/devops-service/lib/executors/server_executor.rb +++ b/devops-service/lib/executors/server_executor.rb @@ -357,7 +357,7 @@ module Devops out << "Server run list: #{@server.run_list.join(", ")}\n" rlist = Set.new.merge(@deploy_env.provider_instance.run_list).merge(@project.run_list).merge(@deploy_env.run_list).merge(@server.run_list) if @server.stack - stack = Devops::Db.stack(@server.stack) + stack = Devops::Db.connector.stack(@server.stack) out << "Stack run list: #{stack.run_list.join(", ")}\n" rlist.merge(stack.run_list) end