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

fix some wrong method names

Browse Source
This commit is contained in:
Anton Chuchkalov 2015-08-27 14:29:19 +03:00
parent 394134798d
commit 0f2698f587
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devops-service/app/api2/routes/stack_template.rb
View File

@ -26,7 +26,7 @@ module Devops
hash['GET'] = lambda {|stack_template_id| hash['GET'] = lambda {|stack_template_id|
check_privileges('stack_template', 'r') 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| hash['DELETE'] = lambda {|stack_template_id|

2
devops-service/lib/executors/server_executor.rb
View File

@ -357,7 +357,7 @@ module Devops
out << "Server run list: #{@server.run_list.join(", ")}\n" 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) 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 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" out << "Stack run list: #{stack.run_list.join(", ")}\n"
rlist.merge(stack.run_list) rlist.merge(stack.run_list)
end end